[Numpy-svn] r8256 - in trunk/numpy: core/code_generators core/src/multiarray core/src/private core/src/umath lib numarray numarray/include/numpy random/mtrand

numpy-svn@scip... numpy-svn@scip...
Tue Feb 23 03:49:39 CST 2010


Author: charris
Date: 2010-02-23 03:49:38 -0600 (Tue, 23 Feb 2010)
New Revision: 8256

Modified:
   trunk/numpy/core/code_generators/generate_numpy_api.py
   trunk/numpy/core/code_generators/generate_ufunc_api.py
   trunk/numpy/core/src/multiarray/arraytypes.c.src
   trunk/numpy/core/src/multiarray/common.c
   trunk/numpy/core/src/multiarray/convert_datatype.c
   trunk/numpy/core/src/multiarray/ctors.c
   trunk/numpy/core/src/multiarray/descriptor.c
   trunk/numpy/core/src/multiarray/getset.c
   trunk/numpy/core/src/multiarray/multiarraymodule.c
   trunk/numpy/core/src/multiarray/scalarapi.c
   trunk/numpy/core/src/multiarray/scalartypes.c.src
   trunk/numpy/core/src/multiarray/scalartypes.h
   trunk/numpy/core/src/multiarray/usertypes.c
   trunk/numpy/core/src/private/npy_3kcompat.h
   trunk/numpy/core/src/umath/ufunc_object.c
   trunk/numpy/core/src/umath/umathmodule.c.src
   trunk/numpy/lib/type_check.py
   trunk/numpy/numarray/_capi.c
   trunk/numpy/numarray/include/numpy/libnumarray.h
   trunk/numpy/random/mtrand/Python.pxi
   trunk/numpy/random/mtrand/mtrand.c
Log:
BUG: Replace deprecated PyCObject by PyCapsule for Python >= 3.1.

Modified: trunk/numpy/core/code_generators/generate_numpy_api.py
===================================================================
--- trunk/numpy/core/code_generators/generate_numpy_api.py	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/code_generators/generate_numpy_api.py	2010-02-23 09:49:38 UTC (rev 8256)
@@ -49,14 +49,25 @@
 _import_array(void)
 {
   int st;
-  PyObject *numpy = PyImport_ImportModule("numpy.core.multiarray");
+  PyObject *numpy = NULL;
   PyObject *c_api = NULL;
-  if (numpy == NULL) return -1;
-  c_api = PyObject_GetAttrString(numpy, "_ARRAY_API");
-  if (c_api == NULL) {Py_DECREF(numpy); return -1;}
+
+
+
+numpy = PyImport_ImportModule("numpy.core.multiarray");
+if (numpy == NULL) return -1;
+c_api = PyObject_GetAttrString(numpy, "_ARRAY_API");
+if (c_api == NULL) {Py_DECREF(numpy); return -1;}
+
+#if PY_VERSION_HEX >= 0x03010000
+  if (PyCapsule_CheckExact(c_api)) {
+      PyArray_API = (void **)PyCapsule_GetPointer(c_api, NULL);
+  }
+#else
   if (PyCObject_Check(c_api)) {
       PyArray_API = (void **)PyCObject_AsVoidPtr(c_api);
   }
+#endif
   Py_DECREF(c_api);
   Py_DECREF(numpy);
   if (PyArray_API == NULL) return -1;
@@ -73,10 +84,10 @@
         (int) NPY_FEATURE_VERSION, (int) PyArray_GetNDArrayCFeatureVersion());
     return -1;
   }
- 
-  /* 
+
+  /*
    * Perform runtime check of endianness and check it matches the one set by
-   * the headers (npy_endian.h) as a safeguard 
+   * the headers (npy_endian.h) as a safeguard
    */
   st = PyArray_GetEndianness();
   if (st == NPY_CPU_UNKNOWN_ENDIAN) {

Modified: trunk/numpy/core/code_generators/generate_ufunc_api.py
===================================================================
--- trunk/numpy/core/code_generators/generate_ufunc_api.py	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/code_generators/generate_ufunc_api.py	2010-02-23 09:49:38 UTC (rev 8256)
@@ -44,9 +44,16 @@
   if (numpy == NULL) return -1;
   c_api = PyObject_GetAttrString(numpy, "_UFUNC_API");
   if (c_api == NULL) {Py_DECREF(numpy); return -1;}
+
+#if PY_VERSION_HEX >= 0x03010000
+  if (PyCapsule_CheckExact(c_api)) {
+      PyUFunc_API = (void **)PyCapsule_GetPointer(c_api, NULL);
+  }
+#else
   if (PyCObject_Check(c_api)) {
       PyUFunc_API = (void **)PyCObject_AsVoidPtr(c_api);
   }
+#endif
   Py_DECREF(c_api);
   Py_DECREF(numpy);
   if (PyUFunc_API == NULL) return -1;

Modified: trunk/numpy/core/src/multiarray/arraytypes.c.src
===================================================================
--- trunk/numpy/core/src/multiarray/arraytypes.c.src	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/arraytypes.c.src	2010-02-23 09:49:38 UTC (rev 8256)
@@ -3533,7 +3533,11 @@
     dt_data->den = 1;
     dt_data->events = 1;
 
+#if defined(NPY_PY3K)
+    cobj = PyCapsule_New((void *)dt_data, NULL, simple_capsule_dtor);
+#else
     cobj = PyCObject_FromVoidPtr((void *)dt_data, _pya_free);
+#endif
     descr->metadata = PyDict_New();
     PyDict_SetItemString(descr->metadata, NPY_METADATA_DTSTR, cobj);
     Py_DECREF(cobj);

Modified: trunk/numpy/core/src/multiarray/common.c
===================================================================
--- trunk/numpy/core/src/multiarray/common.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/common.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -257,14 +257,26 @@
     if ((ip=PyObject_GetAttrString(op, "__array_struct__")) != NULL) {
         PyArrayInterface *inter;
         char buf[40];
+
+#if defined(NPY_PY3K)
+        if (PyCapsule_CheckExact(ip)) {
+            inter = (PyArrayInterface *)PyCapsule_GetPointer(ip, NULL);
+            if (inter->two == 2) {
+                PyOS_snprintf(buf, sizeof(buf),
+                        "|%c%d", inter->typekind, inter->itemsize);
+                chktype = _array_typedescr_fromstr(buf);
+            }
+        }
+#else
         if (PyCObject_Check(ip)) {
-            inter=(PyArrayInterface *)PyCObject_AsVoidPtr(ip);
+            inter = (PyArrayInterface *)PyCObject_AsVoidPtr(ip);
             if (inter->two == 2) {
                 PyOS_snprintf(buf, sizeof(buf),
                         "|%c%d", inter->typekind, inter->itemsize);
                 chktype = _array_typedescr_fromstr(buf);
             }
         }
+#endif
         Py_DECREF(ip);
         if (chktype) {
             goto finish;

Modified: trunk/numpy/core/src/multiarray/convert_datatype.c
===================================================================
--- trunk/numpy/core/src/multiarray/convert_datatype.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/convert_datatype.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -102,9 +102,15 @@
             key = PyInt_FromLong(type_num);
             cobj = PyDict_GetItem(obj, key);
             Py_DECREF(key);
+#if defined(NPY_PY3K)
+            if (PyCapsule_CheckExact(cobj)) {
+                castfunc = PyCapsule_GetPointer(cobj, NULL);
+            }
+#else
             if (PyCObject_Check(cobj)) {
                 castfunc = PyCObject_AsVoidPtr(cobj);
             }
+#endif
         }
     }
     if (PyTypeNum_ISCOMPLEX(descr->type_num) &&

Modified: trunk/numpy/core/src/multiarray/ctors.c
===================================================================
--- trunk/numpy/core/src/multiarray/ctors.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/ctors.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -1140,9 +1140,15 @@
 #endif
     if ((e = PyObject_GetAttrString(s, "__array_struct__")) != NULL) {
         d = -1;
+#if defined(NPY_PY3K)
+        if (PyCapsule_CheckExact(e)) {
+            PyArrayInterface *inter;
+            inter = (PyArrayInterface *)PyCapsule_GetPointer(e, NULL);
+#else
         if (PyCObject_Check(e)) {
             PyArrayInterface *inter;
             inter = (PyArrayInterface *)PyCObject_AsVoidPtr(e);
+#endif
             if (inter->two == 2) {
                 d = inter->nd;
             }
@@ -1565,10 +1571,17 @@
                  */
                 PyArray_UpdateFlags(self, UPDATE_ALL);
             }
+#if defined(NPY_PY3K)
+            if PyCapsule_CheckExact(func) {
+                /* A C-function is stored here */
+                PyArray_FinalizeFunc *cfunc;
+                cfunc = PyCapsule_GetPointer(func, NULL);
+#else
             if PyCObject_Check(func) {
                 /* A C-function is stored here */
                 PyArray_FinalizeFunc *cfunc;
                 cfunc = PyCObject_AsVoidPtr(func);
+#endif
                 Py_DECREF(func);
                 if (cfunc(self, obj) < 0) {
                     goto fail;
@@ -2109,10 +2122,17 @@
         PyErr_Clear();
         return Py_NotImplemented;
     }
+#if defined(NPY_PY3K)
+    if (!PyCapsule_CheckExact(attr)) {
+        goto fail;
+    }
+    inter = PyCapsule_GetPointer(attr, NULL);
+#else
     if (!PyCObject_Check(attr)) {
         goto fail;
     }
     inter = PyCObject_AsVoidPtr(attr);
+#endif
     if (inter->two != 2) {
         goto fail;
     }

Modified: trunk/numpy/core/src/multiarray/descriptor.c
===================================================================
--- trunk/numpy/core/src/multiarray/descriptor.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/descriptor.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -646,7 +646,11 @@
     PyArray_DatetimeMetaData *dt_data;
     PyObject *dt_tuple;
 
+#if defined(NPY_PY3K)
+    dt_data = PyCapsule_GetPointer(cobj, NULL);
+#else
     dt_data = PyCObject_AsVoidPtr(cobj);
+#endif
     dt_tuple = PyTuple_New(4);
 
     PyTuple_SET_ITEM(dt_tuple, 0,
@@ -681,7 +685,11 @@
         }
     }
 
+#if defined(NPY_PY3K)
+    return PyCapsule_New((void *)dt_data, NULL, simple_capsule_dtor);
+#else
     return PyCObject_FromVoidPtr((void *)dt_data, _pya_free);
+#endif
 }
 
 static PyArray_Descr *
@@ -1544,7 +1552,11 @@
         return ret;
     }
     tmp = PyDict_GetItemString(self->metadata, NPY_METADATA_DTSTR);
+#if defined(NPY_PY3K)
+    dt_data = PyCapsule_GetPointer(tmp, NULL);
+#else
     dt_data = PyCObject_AsVoidPtr(tmp);
+#endif
     num = dt_data->num;
     den = dt_data->den;
     events = dt_data->events;

Modified: trunk/numpy/core/src/multiarray/getset.c
===================================================================
--- trunk/numpy/core/src/multiarray/getset.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/getset.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -506,6 +506,7 @@
 array_struct_get(PyArrayObject *self)
 {
     PyArrayInterface *inter;
+    PyObject *ret;
 
     inter = (PyArrayInterface *)_pya_malloc(sizeof(PyArrayInterface));
     if (inter==NULL) {
@@ -551,7 +552,13 @@
         inter->descr = NULL;
     }
     Py_INCREF(self);
-    return PyCObject_FromVoidPtrAndDesc(inter, self, gentype_struct_free);
+#if defined(NPY_PY3K)
+    ret = PyCapsule_New(inter, NULL, gentype_struct_free);
+    PyCapsule_SetContext(ret, self);
+#else
+    ret = PyCObject_FromVoidPtrAndDesc(inter, self, gentype_struct_free);
+#endif
+    return ret;
 }
 
 static PyObject *

Modified: trunk/numpy/core/src/multiarray/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarray/multiarraymodule.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/multiarraymodule.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -1350,8 +1350,13 @@
         return 1;
     }
 
+#if defined(NPY_PY3K)
+    data1 = PyCapsule_GetPointer(cobj1, NULL);
+    data2 = PyCapsule_GetPointer(cobj2, NULL);
+#else
     data1 = PyCObject_AsVoidPtr(cobj1);
     data2 = PyCObject_AsVoidPtr(cobj2);
+#endif
     return ((data1->base == data2->base)
             && (data1->num == data2->num)
             && (data1->den == data2->den)
@@ -3045,7 +3050,11 @@
     if (PyType_Ready(&PyArrayFlags_Type) < 0) {
         return RETVAL;
     }
+#if defined(NPY_PY3K)
+    c_api = PyCapsule_New((void *)PyArray_API, NULL, NULL);
+#else
     c_api = PyCObject_FromVoidPtr((void *)PyArray_API, NULL);
+#endif
     PyDict_SetItemString(d, "_ARRAY_API", c_api);
     Py_DECREF(c_api);
     if (PyErr_Occurred()) {
@@ -3076,7 +3085,11 @@
     PyDict_SetItemString(d, "METADATA_DTSTR", s);
     Py_DECREF(s);
 
+#if defined(NPY_PY3K)
+    s = PyCapsule_New((void *)_datetime_strings, NULL, NULL);
+#else
     s = PyCObject_FromVoidPtr((void *)_datetime_strings, NULL);
+#endif
     PyDict_SetItemString(d, "DATETIMEUNITS", s);
     Py_DECREF(s);
 

Modified: trunk/numpy/core/src/multiarray/scalarapi.c
===================================================================
--- trunk/numpy/core/src/multiarray/scalarapi.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/scalarapi.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -534,7 +534,11 @@
             memcpy(dt_data, &((PyTimedeltaScalarObject *)sc)->obmeta,
                    sizeof(PyArray_DatetimeMetaData));
         }
+#if defined(NPY_PY3K)
+        cobj = PyCapsule_New((void *)dt_data, NULL, simple_capsule_dtor);
+#else
         cobj = PyCObject_FromVoidPtr((void *)dt_data, _pya_free);
+#endif
 
         /* Add correct meta-data to the data-type */
         if (descr == NULL) {
@@ -666,7 +670,11 @@
         PyObject *cobj;
         PyArray_DatetimeMetaData *dt_data;
         cobj = PyDict_GetItemString(descr->metadata, NPY_METADATA_DTSTR);
+#if defined(NPY_PY3K)
+        dt_data = PyCapsule_GetPointer(cobj, NULL);
+#else
         dt_data = PyCObject_AsVoidPtr(cobj);
+#endif
         memcpy(&(((PyDatetimeScalarObject *)obj)->obmeta), dt_data,
                sizeof(PyArray_DatetimeMetaData));
     }

Modified: trunk/numpy/core/src/multiarray/scalartypes.c.src
===================================================================
--- trunk/numpy/core/src/multiarray/scalartypes.c.src	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/scalartypes.c.src	2010-02-23 09:49:38 UTC (rev 8256)
@@ -810,7 +810,22 @@
     return PyInt_FromLong(1);
 }
 
+#if defined(NPY_PY3K)
 NPY_NO_EXPORT void
+gentype_struct_free(PyObject *ptr)
+{
+    PyArrayInterface *arrif;
+    PyObject *context;
+
+    arrif = (PyArrayInterface*)PyCapsule_GetPointer(ptr, NULL);
+    context = (PyObject *)PyCapsule_GetContext(ptr);
+    Py_DECREF(context);
+    Py_XDECREF(arrif->descr);
+    _pya_free(arrif->shape);
+    _pya_free(arrif);
+}
+#else
+NPY_NO_EXPORT void
 gentype_struct_free(void *ptr, void *arg)
 {
     PyArrayInterface *arrif = (PyArrayInterface *)ptr;
@@ -819,12 +834,14 @@
     _pya_free(arrif->shape);
     _pya_free(arrif);
 }
+#endif
 
 static PyObject *
 gentype_struct_get(PyObject *self)
 {
     PyArrayObject *arr;
     PyArrayInterface *inter;
+    PyObject *ret;
 
     arr = (PyArrayObject *)PyArray_FromScalar(self, NULL);
     inter = (PyArrayInterface *)_pya_malloc(sizeof(PyArrayInterface));
@@ -840,7 +857,13 @@
     inter->data = arr->data;
     inter->descr = NULL;
 
-    return PyCObject_FromVoidPtrAndDesc(inter, arr, gentype_struct_free);
+#if defined(NPY_PY3K)
+    ret = PyCapsule_New(inter, NULL, gentype_struct_free);
+    PyCapsule_SetContext(ret, arr);
+#else
+    ret = PyCObject_FromVoidPtrAndDesc(inter, arr, gentype_struct_free);
+#endif
+    return ret;
 }
 
 static PyObject *

Modified: trunk/numpy/core/src/multiarray/scalartypes.h
===================================================================
--- trunk/numpy/core/src/multiarray/scalartypes.h	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/scalartypes.h	2010-02-23 09:49:38 UTC (rev 8256)
@@ -7,8 +7,13 @@
 NPY_NO_EXPORT void
 format_longdouble(char *buf, size_t buflen, longdouble val, unsigned int prec);
 
+#if defined(NPY_PY3K)
 NPY_NO_EXPORT void
+gentype_struct_free(PyObject *ptr);
+#else
+NPY_NO_EXPORT void
 gentype_struct_free(void *ptr, void *arg);
+#endif
 
 NPY_NO_EXPORT int
 _typenum_fromtypeobj(PyObject *type, int user);

Modified: trunk/numpy/core/src/multiarray/usertypes.c
===================================================================
--- trunk/numpy/core/src/multiarray/usertypes.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/multiarray/usertypes.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -206,7 +206,11 @@
     if (PyErr_Occurred()) {
         return -1;
     }
+#if defined(NPY_PY3K)
+    cobj = PyCapsule_New((void *)castfunc, NULL, NULL);
+#else
     cobj = PyCObject_FromVoidPtr((void *)castfunc, NULL);
+#endif
     if (cobj == NULL) {
         Py_DECREF(key);
         return -1;

Modified: trunk/numpy/core/src/private/npy_3kcompat.h
===================================================================
--- trunk/numpy/core/src/private/npy_3kcompat.h	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/private/npy_3kcompat.h	2010-02-23 09:49:38 UTC (rev 8256)
@@ -212,4 +212,16 @@
 }
 #endif
 
+/*
+ * A destructor is needed for PyCapsule objects to
+ * replace _pya_free.
+ */
+#if defined(NPY_PY3K)
+static void
+simple_capsule_dtor(PyObject *cap)
+{
+    PyArray_free(PyCapsule_GetPointer(cap, NULL));
+}
+#endif
+
 #endif /* _NPY_3KCOMPAT_H_ */

Modified: trunk/numpy/core/src/umath/ufunc_object.c
===================================================================
--- trunk/numpy/core/src/umath/ufunc_object.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/umath/ufunc_object.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -372,7 +372,11 @@
     PyUFunc_Loop1d *funcdata;
     int i;
 
+#if defined(NPY_PY3K)
+    funcdata = (PyUFunc_Loop1d *)PyCapsule_GetPointer(obj, NULL);
+#else
     funcdata = (PyUFunc_Loop1d *)PyCObject_AsVoidPtr(obj);
+#endif
     while (funcdata != NULL) {
         for (i = 0; i < nin; i++) {
             if (!PyArray_CanCoerceScalar(arg_types[i],
@@ -517,7 +521,11 @@
          * extract the correct function
          * data and argtypes
          */
+#if defined(NPY_PY3K)
+        funcdata = (PyUFunc_Loop1d *)PyCapsule_GetPointer(obj, NULL);
+#else
         funcdata = (PyUFunc_Loop1d *)PyCObject_AsVoidPtr(obj);
+#endif
         while (funcdata != NULL) {
             if (n != 1) {
                 for (i = 0; i < nargs; i++) {
@@ -3876,7 +3884,23 @@
  * This frees the linked-list structure when the CObject
  * is destroyed (removed from the internal dictionary)
 */
+#if defined(NPY_PY3K)
 static void
+_loop1d_list_free(PyObject *ptr)
+{
+    PyUFunc_Loop1d *funcdata;
+
+    funcdata = (PyUFunc_Loop1d *)PyCapsule_GetPointer(ptr, NULL);
+    if (funcdata == NULL) {
+        return;
+    }
+    _pya_free(funcdata->arg_types);
+    _loop1d_list_free(funcdata->next);
+    _pya_free(funcdata);
+}
+
+#else
+static void
 _loop1d_list_free(void *ptr)
 {
     PyUFunc_Loop1d *funcdata;
@@ -3891,6 +3915,7 @@
     _loop1d_list_free(funcdata->next);
     _pya_free(funcdata);
 }
+#endif
 
 
 /*UFUNC_API*/
@@ -3949,7 +3974,11 @@
     cobj = PyDict_GetItem(ufunc->userloops, key);
     /* If it's not there, then make one and return. */
     if (cobj == NULL) {
+#if defined(NPY_PY3K)
+        cobj = PyCapsule_New((void *)funcdata, NULL, _loop1d_list_free);
+#else
         cobj = PyCObject_FromVoidPtr((void *)funcdata, _loop1d_list_free);
+#endif
         if (cobj == NULL) {
             goto fail;
         }
@@ -3967,7 +3996,11 @@
          * is exactly like this one, then just replace.
          * Otherwise insert.
          */
+#if defined(NPY_PY3K)
+        current = (PyUFunc_Loop1d *)PyCapsule_GetPointer(cobj, NULL);
+#else
         current = (PyUFunc_Loop1d *)PyCObject_AsVoidPtr(cobj);
+#endif
         while (current != NULL) {
             cmp = cmp_arg_types(current->arg_types, newtypes, ufunc->nargs);
             if (cmp >= 0) {

Modified: trunk/numpy/core/src/umath/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umath/umathmodule.c.src	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/core/src/umath/umathmodule.c.src	2010-02-23 09:49:38 UTC (rev 8256)
@@ -263,6 +263,8 @@
 };
 #endif
 
+#include <stdio.h>
+
 #if defined(NPY_PY3K)
 #define RETVAL m
 PyObject *PyInit_umath(void)
@@ -303,11 +305,19 @@
     /* Add some symbolic constants to the module */
     d = PyModule_GetDict(m);
 
+#if defined(NPY_PY3K)
+    c_api = PyCapsule_New((void *)PyUFunc_API, NULL, NULL);
+#else
     c_api = PyCObject_FromVoidPtr((void *)PyUFunc_API, NULL);
-    if (PyErr_Occurred()) goto err;
+#endif
+    if (PyErr_Occurred()) {
+        goto err;
+    }
     PyDict_SetItemString(d, "_UFUNC_API", c_api);
     Py_DECREF(c_api);
-    if (PyErr_Occurred()) goto err;
+    if (PyErr_Occurred()) {
+        goto err;
+    }
 
     s = PyString_FromString("0.4.0");
     PyDict_SetItemString(d, "__version__", s);

Modified: trunk/numpy/lib/type_check.py
===================================================================
--- trunk/numpy/lib/type_check.py	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/lib/type_check.py	2010-02-23 09:49:38 UTC (rev 8256)
@@ -611,7 +611,7 @@
 
     if dtype.kind not in ['m','M']:
         raise ValueError, "Not a date-time dtype"
-    
+
     obj = dtype.metadata[METADATA_DTSTR]
     class DATETIMEMETA(ctypes.Structure):
         _fields_ = [('base', ctypes.c_int),
@@ -619,11 +619,16 @@
                     ('den', ctypes.c_int),
                     ('events', ctypes.c_int)]
 
-    func = ctypes.pythonapi.PyCObject_AsVoidPtr
-    func.argtypes = [ctypes.py_object]
-    func.restype = ctypes.c_void_p
-
-    result = func(ctypes.py_object(obj))
+    if sys.version_info[:2] >= (3,1):
+        func = ctypes.pythonapi.PyCapsule_GetPointer
+        func.argtypes = [ctypes.py_object, ctypes.c_char_p]
+        func.restype = ctypes.c_void_p
+        result = func(ctypes.py_object(obj), ctypes.c_char_p(None))
+    else:
+        func = ctypes.pythonapi.PyCObject_AsVoidPtr
+        func.argtypes = [ctypes.py_object]
+        func.restype = ctypes.c_void_p
+        result = func(ctypes.py_object(obj))
     result = ctypes.cast(ctypes.c_void_p(result), ctypes.POINTER(DATETIMEMETA))
 
     struct = result[0]
@@ -636,4 +641,4 @@
     _unitnum2name = ctypes.cast(ctypes.c_void_p(result), ctypes.POINTER(ctypes.c_char_p))
 
     return (_unitnum2name[base], struct.num, struct.den, struct.events)
-    
+

Modified: trunk/numpy/numarray/_capi.c
===================================================================
--- trunk/numpy/numarray/_capi.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/numarray/_capi.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -3380,7 +3380,11 @@
     _Error = PyErr_NewException("numpy.numarray._capi.error", NULL, NULL);
 
     /* Create a CObject containing the API pointer array's address */
+#if defined(NPY_PY3K)
+    c_api_object = PyCapsule_New((void *)libnumarray_API, NULL, NULL);
+#else
     c_api_object = PyCObject_FromVoidPtr((void *)libnumarray_API, NULL);
+#endif
 
     if (c_api_object != NULL) {
         /* Create a name for this object in the module's namespace */

Modified: trunk/numpy/numarray/include/numpy/libnumarray.h
===================================================================
--- trunk/numpy/numarray/include/numpy/libnumarray.h	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/numarray/include/numpy/libnumarray.h	2010-02-23 09:49:38 UTC (rev 8256)
@@ -1,4 +1,4 @@
-/* Compatibility with numarray.  Do not use in new code. 
+/* Compatibility with numarray.  Do not use in new code.
  */
 
 #ifndef NUMPY_LIBNUMARRAY_H
@@ -29,7 +29,7 @@
 extension modules are monolithic C files, and likely for good reason.
 */
 
-/* C API address pointer */ 
+/* C API address pointer */
 #if defined(NO_IMPORT) || defined(NO_IMPORT_ARRAY)
 extern void **libnumarray_API;
 #else
@@ -40,37 +40,56 @@
 #endif
 #endif
 
-#define _import_libnumarray()                                           \
-        {                                                               \
-        PyObject *module = PyImport_ImportModule("numpy.numarray._capi"); \
-        if (module != NULL) {                                               \
-          PyObject *module_dict = PyModule_GetDict(module);                 \
-          PyObject *c_api_object =                                          \
-                 PyDict_GetItemString(module_dict, "_C_API");               \
-          if (c_api_object && PyCObject_Check(c_api_object)) {              \
-            libnumarray_API = (void **)PyCObject_AsVoidPtr(c_api_object);      \
-          } else {                                                          \
-            PyErr_Format(PyExc_ImportError,                                 \
-                         "Can't get API for module 'numpy.numarray._capi'");  \
-          }                                                                 \
-        }                                                                   \
+#if defined(NPY_PY3K)
+#define _import_libnumarray()                                                    \
+        {                                                                        \
+        PyObject *module = PyImport_ImportModule("numpy.numarray._capi");        \
+        if (module != NULL) {                                                    \
+          PyObject *module_dict = PyModule_GetDict(module);                      \
+          PyObject *c_api_object =                                               \
+                 PyDict_GetItemString(module_dict, "_C_API");                    \
+          if (c_api_object && PyCapsule_CheckExact(c_api_object)) {              \
+            libnumarray_API = (void **)PyCapsule_GetPointer(c_api_object, NULL); \
+          } else {                                                               \
+            PyErr_Format(PyExc_ImportError,                                      \
+                         "Can't get API for module 'numpy.numarray._capi'");     \
+          }                                                                      \
+        }                                                                        \
       }
-      
+
+#else
+#define _import_libnumarray()                                                   \
+        {                                                                       \
+        PyObject *module = PyImport_ImportModule("numpy.numarray._capi");       \
+        if (module != NULL) {                                                   \
+          PyObject *module_dict = PyModule_GetDict(module);                     \
+          PyObject *c_api_object =                                              \
+                 PyDict_GetItemString(module_dict, "_C_API");                   \
+          if (c_api_object && PyCObject_Check(c_api_object)) {                  \
+            libnumarray_API = (void **)PyCObject_AsVoidPtr(c_api_object);       \
+          } else {                                                              \
+            PyErr_Format(PyExc_ImportError,                                     \
+                         "Can't get API for module 'numpy.numarray._capi'");    \
+          }                                                                     \
+        }                                                                       \
+      }
+#endif
+
 #define import_libnumarray() _import_libnumarray(); if (PyErr_Occurred()) { PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.numarray._capi failed to import.\n"); return; }
-      
+
 #endif
 
 
 #define libnumarray_FatalApiError (Py_FatalError("Call to API function without first calling import_libnumarray() in " __FILE__), NULL)
-      
 
+
 /* Macros defining components of function prototypes */
 
 #ifdef _libnumarray_MODULE
   /* This section is used when compiling libnumarray */
 
 static PyObject *_Error;
-  
+
 static PyObject*  getBuffer  (PyObject*o);
 
 static int  isBuffer  (PyObject*o);
@@ -333,7 +352,7 @@
 
 static PyArrayObject *  NA_FromArrayStruct  (PyObject *a);
 
-  
+
 #else
   /* This section is used in modules that use libnumarray */
 

Modified: trunk/numpy/random/mtrand/Python.pxi
===================================================================
--- trunk/numpy/random/mtrand/Python.pxi	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/random/mtrand/Python.pxi	2010-02-23 09:49:38 UTC (rev 8256)
@@ -29,15 +29,15 @@
     void Py_XINCREF(object obj)
 
     # CObject API
-    ctypedef void (*destructor1)(void* cobj)
-    ctypedef void (*destructor2)(void* cobj, void* desc)
-    int PyCObject_Check(object p)
-    object PyCObject_FromVoidPtr(void* cobj, destructor1 destr)
-    object PyCObject_FromVoidPtrAndDesc(void* cobj, void* desc, 
-        destructor2 destr)
-    void* PyCObject_AsVoidPtr(object self)
-    void* PyCObject_GetDesc(object self)
-    int PyCObject_SetVoidPtr(object self, void* cobj)  
+#    ctypedef void (*destructor1)(void* cobj)
+#    ctypedef void (*destructor2)(void* cobj, void* desc)
+#    int PyCObject_Check(object p)
+#    object PyCObject_FromVoidPtr(void* cobj, destructor1 destr)
+#    object PyCObject_FromVoidPtrAndDesc(void* cobj, void* desc,
+#        destructor2 destr)
+#    void* PyCObject_AsVoidPtr(object self)
+#    void* PyCObject_GetDesc(object self)
+#    int PyCObject_SetVoidPtr(object self, void* cobj)
 
     # TypeCheck API
     int PyFloat_Check(object obj)
@@ -46,7 +46,7 @@
     # Error API
     int PyErr_Occurred()
     void PyErr_Clear()
- 
+
 cdef extern from "string.h":
     void *memcpy(void *s1, void *s2, int n)
 

Modified: trunk/numpy/random/mtrand/mtrand.c
===================================================================
--- trunk/numpy/random/mtrand/mtrand.c	2010-02-22 21:33:56 UTC (rev 8255)
+++ trunk/numpy/random/mtrand/mtrand.c	2010-02-23 09:49:38 UTC (rev 8256)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.12.1 on Sat Feb 20 22:47:50 2010 */
+/* Generated by Cython 0.12 on Mon Feb 22 20:43:03 2010 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -6,7 +6,6 @@
 #ifndef Py_PYTHON_H
     #error Python headers needed to compile C extensions, please install development version of Python.
 #else
-
 #ifndef PY_LONG_LONG
   #define PY_LONG_LONG LONG_LONG
 #endif
@@ -18,7 +17,6 @@
   #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
   #define PyDict_Contains(d,o)   PySequence_Contains(d,o)
 #endif
-
 #if PY_VERSION_HEX < 0x02050000
   typedef int Py_ssize_t;
   #define PY_SSIZE_T_MAX INT_MAX
@@ -28,9 +26,7 @@
   #define PyInt_AsSsize_t(o)   PyInt_AsLong(o)
   #define PyNumber_Index(o)    PyNumber_Int(o)
   #define PyIndex_Check(o)     PyNumber_Check(o)
-  #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
 #endif
-
 #if PY_VERSION_HEX < 0x02060000
   #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
   #define Py_TYPE(ob)   (((PyObject*)(ob))->ob_type)
@@ -40,17 +36,17 @@
   #define PyType_Modified(t)
 
   typedef struct {
-     void *buf;
-     PyObject *obj;
-     Py_ssize_t len;
-     Py_ssize_t itemsize;
-     int readonly;
-     int ndim;
-     char *format;
-     Py_ssize_t *shape;
-     Py_ssize_t *strides;
-     Py_ssize_t *suboffsets;
-     void *internal;
+       void *buf;
+       PyObject *obj;
+       Py_ssize_t len;
+       Py_ssize_t itemsize;
+       int readonly;
+       int ndim;
+       char *format;
+       Py_ssize_t *shape;
+       Py_ssize_t *strides;
+       Py_ssize_t *suboffsets;
+       void *internal;
   } Py_buffer;
 
   #define PyBUF_SIMPLE 0
@@ -64,22 +60,18 @@
   #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
 
 #endif
-
 #if PY_MAJOR_VERSION < 3
   #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
 #else
   #define __Pyx_BUILTIN_MODULE_NAME "builtins"
 #endif
-
 #if PY_MAJOR_VERSION >= 3
   #define Py_TPFLAGS_CHECKTYPES 0
   #define Py_TPFLAGS_HAVE_INDEX 0
 #endif
-
 #if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
   #define Py_TPFLAGS_HAVE_NEWBUFFER 0
 #endif
-
 #if PY_MAJOR_VERSION >= 3
   #define PyBaseString_Type            PyUnicode_Type
   #define PyString_Type                PyUnicode_Type
@@ -88,7 +80,6 @@
   #define PyBytes_Type                 PyString_Type
   #define PyBytes_CheckExact           PyString_CheckExact
 #endif
-
 #if PY_MAJOR_VERSION >= 3
   #define PyInt_Type                   PyLong_Type
   #define PyInt_Check(op)              PyLong_Check(op)
@@ -108,13 +99,10 @@
 #else
   #define __Pyx_PyNumber_Divide(x,y)         PyNumber_Divide(x,y)
   #define __Pyx_PyNumber_InPlaceDivide(x,y)  PyNumber_InPlaceDivide(x,y)
-
 #endif
-
 #if PY_MAJOR_VERSION >= 3
   #define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)
 #endif
-
 #if !defined(WIN32) && !defined(MS_WINDOWS)
   #ifndef __stdcall
     #define __stdcall
@@ -128,7 +116,6 @@
 #else
   #define _USE_MATH_DEFINES
 #endif
-
 #if PY_VERSION_HEX < 0x02050000
   #define __Pyx_GetAttrString(o,n)   PyObject_GetAttrString((o),((char *)(n)))
   #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
@@ -138,7 +125,6 @@
   #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
   #define __Pyx_DelAttrString(o,n)   PyObject_DelAttrString((o),(n))
 #endif
-
 #if PY_VERSION_HEX < 0x02050000
   #define __Pyx_NAMESTR(n) ((char *)(n))
   #define __Pyx_DOCSTR(n)  ((char *)(n))
@@ -161,14 +147,12 @@
 #include "distributions.h"
 #include "initarray.h"
 
-#ifndef CYTHON_INLINE
-  #if defined(__GNUC__)
-    #define CYTHON_INLINE __inline__
-  #elif defined(_MSC_VER)
-    #define CYTHON_INLINE __inline
-  #else
-    #define CYTHON_INLINE 
-  #endif
+#ifdef __GNUC__
+#define INLINE __inline__
+#elif _WIN32
+#define INLINE __inline
+#else
+#define INLINE 
 #endif
 
 typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/
@@ -190,8 +174,8 @@
 #define __Pyx_PyBytes_AsUString(s)        ((unsigned char*) __Pyx_PyBytes_AsString(s))
 
 #define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
-static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
+static INLINE int __Pyx_PyObject_IsTrue(PyObject*);
+static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
 
 #if !defined(T_PYSSIZET)
 #if PY_VERSION_HEX < 0x02050000
@@ -255,9 +239,9 @@
 #endif
 #endif
 
-static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
-static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
-static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
+static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
+static INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
+static INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
 
 #define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
 
@@ -307,7 +291,7 @@
 
 typedef long (*__pyx_t_6mtrand_rk_discd)(rk_state *, double);
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":522
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":522
  *     return sum
  * 
  * cdef class RandomState:             # <<<<<<<<<<<<<<
@@ -374,8 +358,14 @@
 
 static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],     PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,     const char* function_name); /*proto*/
 
+static INLINE PyObject* __Pyx_Type(PyObject* o) {
+    PyObject* type = (PyObject*) Py_TYPE(o);
+    Py_INCREF(type);
+    return type;
+}
 
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
+
+static INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
     PyObject *r;
     if (!j) return NULL;
     r = PyObject_GetItem(o, j);
@@ -388,7 +378,7 @@
                                                     __Pyx_GetItemInt_List_Fast(o, i, size <= sizeof(long)) : \
                                                     __Pyx_GetItemInt_Generic(o, to_py_func(i)))
 
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+static INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
     if (likely(o != Py_None)) {
         if (likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {
             PyObject *r = PyList_GET_ITEM(o, i);
@@ -408,7 +398,7 @@
                                                     __Pyx_GetItemInt_Tuple_Fast(o, i, size <= sizeof(long)) : \
                                                     __Pyx_GetItemInt_Generic(o, to_py_func(i)))
 
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+static INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
     if (likely(o != Py_None)) {
         if (likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {
             PyObject *r = PyTuple_GET_ITEM(o, i);
@@ -429,7 +419,7 @@
                                                     __Pyx_GetItemInt_Fast(o, i, size <= sizeof(long)) : \
                                                     __Pyx_GetItemInt_Generic(o, to_py_func(i)))
 
-static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+static INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
     PyObject *r;
     if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {
         r = PyList_GET_ITEM(o, i);
@@ -448,21 +438,21 @@
     return r;
 }
 
-static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);
+static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);
 
-static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void);
+static INLINE void __Pyx_RaiseTooManyValuesError(void);
 
 static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); /*proto*/
 static int __Pyx_EndUnpack(PyObject *); /*proto*/
 
 static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 
-static CYTHON_INLINE int __Pyx_CheckKeywordStrings(PyObject *kwdict,
+static INLINE int __Pyx_CheckKeywordStrings(PyObject *kwdict,
     const char* function_name, int kw_allowed); /*proto*/
 
-static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
+static INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
 
-static CYTHON_INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
+static INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
     if (likely(PyList_CheckExact(L))) {
         if (PyList_Append(L, x) < 0) return NULL;
         Py_INCREF(Py_None);
@@ -482,7 +472,7 @@
                                                     __Pyx_SetItemInt_Fast(o, i, v, size <= sizeof(long)) : \
                                                     __Pyx_SetItemInt_Generic(o, to_py_func(i), v))
 
-static CYTHON_INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v) {
+static INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v) {
     int r;
     if (!j) return -1;
     r = PyObject_SetItem(o, j, v);
@@ -490,7 +480,7 @@
     return r;
 }
 
-static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, int fits_long) {
+static INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, int fits_long) {
     if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {
         Py_INCREF(v);
         Py_DECREF(PyList_GET_ITEM(o, i));
@@ -505,49 +495,49 @@
     }
 }
 
-static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
 
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
 
 static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
 
-static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 
 static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
 
-static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
+static INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
 
-static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
+static INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
 
-static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
+static INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
 
-static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject *);
+static INLINE char __Pyx_PyInt_AsChar(PyObject *);
 
-static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject *);
+static INLINE short __Pyx_PyInt_AsShort(PyObject *);
 
-static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject *);
+static INLINE int __Pyx_PyInt_AsInt(PyObject *);
 
-static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
+static INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
 
-static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
+static INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
 
-static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
+static INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
 
-static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
+static INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
 
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
+static INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
 
-static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject *);
+static INLINE long __Pyx_PyInt_AsLong(PyObject *);
 
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
+static INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
 
-static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
+static INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
 
-static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
+static INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
 
-static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size, int strict);  /*proto*/
+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size);  /*proto*/
 
 static PyObject *__Pyx_ImportModule(const char *name); /*proto*/
 
@@ -1020,7 +1010,7 @@
 static PyObject *__pyx_k_33;
 static PyObject *__pyx_k_43;
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":128
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":128
  * import numpy as np
  * 
  * cdef object cont0_array(rk_state *state, rk_cont0 func, object size):             # <<<<<<<<<<<<<<
@@ -1043,7 +1033,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":134
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":134
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1053,7 +1043,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":135
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":135
  * 
  *     if size is None:
  *         return func(state)             # <<<<<<<<<<<<<<
@@ -1070,7 +1060,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":137
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":137
  *         return func(state)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1104,7 +1094,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":138
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":138
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1113,7 +1103,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":139
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":139
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1122,7 +1112,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":140
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":140
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1132,7 +1122,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":141
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":141
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)             # <<<<<<<<<<<<<<
@@ -1142,7 +1132,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":142
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":142
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)
  *         return array             # <<<<<<<<<<<<<<
@@ -1172,7 +1162,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":145
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":145
  * 
  * 
  * cdef object cont1_array_sc(rk_state *state, rk_cont1 func, object size, double a):             # <<<<<<<<<<<<<<
@@ -1195,7 +1185,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":151
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":151
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1205,7 +1195,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":152
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":152
  * 
  *     if size is None:
  *         return func(state, a)             # <<<<<<<<<<<<<<
@@ -1222,7 +1212,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":154
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":154
  *         return func(state, a)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1256,7 +1246,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":155
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":155
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1265,7 +1255,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":156
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":156
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1274,7 +1264,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":157
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":157
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1284,7 +1274,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":158
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":158
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)             # <<<<<<<<<<<<<<
@@ -1294,7 +1284,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":159
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":159
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)
  *         return array             # <<<<<<<<<<<<<<
@@ -1324,7 +1314,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":161
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":161
  *         return array
  * 
  * cdef object cont1_array(rk_state *state, rk_cont1 func, object size, ndarray oa):             # <<<<<<<<<<<<<<
@@ -1353,7 +1343,7 @@
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":170
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":170
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1363,7 +1353,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":171
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":171
  * 
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_DOUBLE)             # <<<<<<<<<<<<<<
@@ -1377,7 +1367,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":172
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":172
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_DOUBLE)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1386,7 +1376,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":173
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":173
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_DOUBLE)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1395,7 +1385,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":174
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":174
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)             # <<<<<<<<<<<<<<
@@ -1409,7 +1399,7 @@
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":175
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":175
  *         array_data = <double *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1419,7 +1409,7 @@
     __pyx_t_3 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":176
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":176
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])             # <<<<<<<<<<<<<<
@@ -1428,7 +1418,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":177
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":177
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])
  *             PyArray_ITER_NEXT(itera)             # <<<<<<<<<<<<<<
@@ -1441,7 +1431,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":179
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":179
  *             PyArray_ITER_NEXT(itera)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1475,7 +1465,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":180
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":180
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1484,7 +1474,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":182
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":182
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array,
  *                                                 <void *>oa)             # <<<<<<<<<<<<<<
@@ -1498,7 +1488,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":183
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":183
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array,
  *                                                 <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -1508,7 +1498,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":184
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":184
  *                                                 <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -1530,7 +1520,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":185
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":185
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -1540,7 +1530,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":186
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":186
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -1549,7 +1539,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":187
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":187
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])             # <<<<<<<<<<<<<<
@@ -1558,7 +1548,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":188
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":188
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -1570,7 +1560,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":189
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":189
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *     return array             # <<<<<<<<<<<<<<
@@ -1601,7 +1591,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":191
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":191
  *     return array
  * 
  * cdef object cont2_array_sc(rk_state *state, rk_cont2 func, object size, double a,             # <<<<<<<<<<<<<<
@@ -1624,7 +1614,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":198
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":198
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1634,7 +1624,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":199
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":199
  * 
  *     if size is None:
  *         return func(state, a, b)             # <<<<<<<<<<<<<<
@@ -1651,7 +1641,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":201
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":201
  *         return func(state, a, b)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1685,7 +1675,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":202
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":202
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1694,7 +1684,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":203
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":203
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1703,7 +1693,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":204
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":204
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1713,7 +1703,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":205
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":205
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b)             # <<<<<<<<<<<<<<
@@ -1723,7 +1713,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a, __pyx_v_b);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":206
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":206
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b)
  *         return array             # <<<<<<<<<<<<<<
@@ -1753,7 +1743,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":209
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":209
  * 
  * 
  * cdef object cont2_array(rk_state *state, rk_cont2 func, object size,             # <<<<<<<<<<<<<<
@@ -1781,7 +1771,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":219
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":219
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1791,7 +1781,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":220
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":220
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>oa, <void *>ob)             # <<<<<<<<<<<<<<
@@ -1805,7 +1795,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":221
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":221
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>oa, <void *>ob)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)             # <<<<<<<<<<<<<<
@@ -1819,7 +1809,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":222
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":222
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>oa, <void *>ob)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1828,7 +1818,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":223
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":223
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -1838,7 +1828,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":224
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":224
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -1847,7 +1837,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":225
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":225
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -1856,7 +1846,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":226
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":226
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])             # <<<<<<<<<<<<<<
@@ -1865,7 +1855,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":227
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":227
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -1878,7 +1868,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":229
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":229
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1912,7 +1902,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":230
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":230
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1921,7 +1911,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":231
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":231
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>oa, <void *>ob)             # <<<<<<<<<<<<<<
@@ -1935,7 +1925,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":232
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":232
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>oa, <void *>ob)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -1945,7 +1935,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":233
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":233
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>oa, <void *>ob)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -1967,7 +1957,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":234
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":234
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -1977,7 +1967,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":235
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":235
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -1986,7 +1976,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":236
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":236
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -1995,7 +1985,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":237
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":237
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])             # <<<<<<<<<<<<<<
@@ -2004,7 +1994,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":238
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":238
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -2013,7 +2003,7 @@
  */
       PyArray_MultiIter_NEXTi(__pyx_v_multi, 1);
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":239
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":239
  *             array_data[i] = func(state, oa_data[0], ob_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)             # <<<<<<<<<<<<<<
@@ -2025,7 +2015,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":240
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":240
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)
  *     return array             # <<<<<<<<<<<<<<
@@ -2056,7 +2046,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":242
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":242
  *     return array
  * 
  * cdef object cont3_array_sc(rk_state *state, rk_cont3 func, object size, double a,             # <<<<<<<<<<<<<<
@@ -2079,7 +2069,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":250
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":250
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2089,7 +2079,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":251
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":251
  * 
  *     if size is None:
  *         return func(state, a, b, c)             # <<<<<<<<<<<<<<
@@ -2106,7 +2096,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":253
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":253
  *         return func(state, a, b, c)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -2140,7 +2130,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":254
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":254
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -2149,7 +2139,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":255
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":255
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -2158,7 +2148,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":256
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":256
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -2168,7 +2158,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":257
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":257
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b, c)             # <<<<<<<<<<<<<<
@@ -2178,7 +2168,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a, __pyx_v_b, __pyx_v_c);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":258
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":258
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b, c)
  *         return array             # <<<<<<<<<<<<<<
@@ -2208,7 +2198,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":260
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":260
  *         return array
  * 
  * cdef object cont3_array(rk_state *state, rk_cont3 func, object size, ndarray oa,             # <<<<<<<<<<<<<<
@@ -2238,7 +2228,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":272
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":272
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2248,7 +2238,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":273
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":273
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>oa, <void *>ob, <void *>oc)             # <<<<<<<<<<<<<<
@@ -2262,7 +2252,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":274
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":274
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>oa, <void *>ob, <void *>oc)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)             # <<<<<<<<<<<<<<
@@ -2276,7 +2266,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":275
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":275
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>oa, <void *>ob, <void *>oc)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -2285,7 +2275,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":276
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":276
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -2295,7 +2285,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":277
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":277
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -2304,7 +2294,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":278
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":278
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -2313,7 +2303,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":279
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":279
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -2322,7 +2312,7 @@
  */
       __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":280
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":280
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])             # <<<<<<<<<<<<<<
@@ -2331,7 +2321,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]), (__pyx_v_oc_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":281
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":281
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -2344,7 +2334,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":283
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":283
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -2378,7 +2368,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":284
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":284
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -2387,7 +2377,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":286
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":286
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>oa,
  *                                                 <void *>ob, <void *>oc)             # <<<<<<<<<<<<<<
@@ -2401,7 +2391,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":287
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":287
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>oa,
  *                                                 <void *>ob, <void *>oc)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -2411,7 +2401,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":288
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":288
  *                                                 <void *>ob, <void *>oc)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -2433,7 +2423,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":289
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":289
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -2443,7 +2433,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":290
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":290
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -2452,7 +2442,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":291
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":291
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -2461,7 +2451,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":292
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":292
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 3)             # <<<<<<<<<<<<<<
@@ -2470,7 +2460,7 @@
  */
       __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 3));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":293
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":293
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])             # <<<<<<<<<<<<<<
@@ -2479,7 +2469,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]), (__pyx_v_oc_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":294
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":294
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -2491,7 +2481,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":295
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":295
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])
  *             PyArray_MultiIter_NEXT(multi)
  *     return array             # <<<<<<<<<<<<<<
@@ -2523,7 +2513,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":297
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":297
  *     return array
  * 
  * cdef object disc0_array(rk_state *state, rk_disc0 func, object size):             # <<<<<<<<<<<<<<
@@ -2546,7 +2536,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":303
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":303
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2556,7 +2546,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":304
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":304
  * 
  *     if size is None:
  *         return func(state)             # <<<<<<<<<<<<<<
@@ -2573,7 +2563,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":306
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":306
  *         return func(state)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -2602,7 +2592,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":307
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":307
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -2611,7 +2601,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":308
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":308
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2620,7 +2610,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":309
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":309
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -2630,7 +2620,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":310
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":310
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)             # <<<<<<<<<<<<<<
@@ -2640,7 +2630,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":311
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":311
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)
  *         return array             # <<<<<<<<<<<<<<
@@ -2670,7 +2660,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":313
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":313
  *         return array
  * 
  * cdef object discnp_array_sc(rk_state *state, rk_discnp func, object size, long n, double p):             # <<<<<<<<<<<<<<
@@ -2693,7 +2683,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":319
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":319
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2703,7 +2693,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":320
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":320
  * 
  *     if size is None:
  *         return func(state, n, p)             # <<<<<<<<<<<<<<
@@ -2720,7 +2710,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":322
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":322
  *         return func(state, n, p)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -2749,7 +2739,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":323
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":323
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -2758,7 +2748,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":324
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":324
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2767,7 +2757,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":325
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":325
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -2777,7 +2767,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":326
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":326
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)             # <<<<<<<<<<<<<<
@@ -2787,7 +2777,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_n, __pyx_v_p);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":327
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":327
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)
  *         return array             # <<<<<<<<<<<<<<
@@ -2817,7 +2807,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":329
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":329
  *         return array
  * 
  * cdef object discnp_array(rk_state *state, rk_discnp func, object size, ndarray on, ndarray op):             # <<<<<<<<<<<<<<
@@ -2845,7 +2835,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":338
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":338
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2855,7 +2845,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":339
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":339
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -2869,7 +2859,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":340
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":340
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -2883,7 +2873,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":341
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":341
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2892,7 +2882,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":342
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":342
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -2902,7 +2892,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":343
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":343
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -2911,7 +2901,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":344
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":344
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -2920,7 +2910,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":345
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":345
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -2929,7 +2919,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":346
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":346
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -2942,7 +2932,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":348
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":348
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -2971,7 +2961,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":349
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":349
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2980,7 +2970,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":350
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":350
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -2994,7 +2984,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":351
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":351
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -3004,7 +2994,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":352
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":352
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -3026,7 +3016,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":353
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":353
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3036,7 +3026,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":354
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":354
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3045,7 +3035,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":355
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":355
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3054,7 +3044,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":356
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":356
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -3063,7 +3053,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":357
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":357
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -3072,7 +3062,7 @@
  */
       PyArray_MultiIter_NEXTi(__pyx_v_multi, 1);
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":358
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":358
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)             # <<<<<<<<<<<<<<
@@ -3084,7 +3074,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":360
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":360
  *             PyArray_MultiIter_NEXTi(multi, 2)
  * 
  *     return array             # <<<<<<<<<<<<<<
@@ -3115,7 +3105,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":362
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":362
  *     return array
  * 
  * cdef object discdd_array_sc(rk_state *state, rk_discdd func, object size, double n, double p):             # <<<<<<<<<<<<<<
@@ -3138,7 +3128,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":368
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":368
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3148,7 +3138,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":369
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":369
  * 
  *     if size is None:
  *         return func(state, n, p)             # <<<<<<<<<<<<<<
@@ -3165,7 +3155,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":371
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":371
  *         return func(state, n, p)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3194,7 +3184,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":372
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":372
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -3203,7 +3193,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":373
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":373
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3212,7 +3202,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":374
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":374
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -3222,7 +3212,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":375
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":375
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)             # <<<<<<<<<<<<<<
@@ -3232,7 +3222,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_n, __pyx_v_p);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":376
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":376
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)
  *         return array             # <<<<<<<<<<<<<<
@@ -3262,7 +3252,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":378
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":378
  *         return array
  * 
  * cdef object discdd_array(rk_state *state, rk_discdd func, object size, ndarray on, ndarray op):             # <<<<<<<<<<<<<<
@@ -3290,7 +3280,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":387
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":387
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3300,7 +3290,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":388
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":388
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -3314,7 +3304,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":389
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":389
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -3328,7 +3318,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":390
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":390
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3337,7 +3327,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":391
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":391
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3347,7 +3337,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":392
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":392
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -3356,7 +3346,7 @@
  */
       __pyx_v_on_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":393
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":393
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3365,7 +3355,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":394
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":394
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -3374,7 +3364,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":395
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":395
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -3387,7 +3377,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":397
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":397
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3416,7 +3406,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":398
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":398
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3425,7 +3415,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":399
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":399
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -3439,7 +3429,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":400
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":400
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -3449,7 +3439,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":401
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":401
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -3471,7 +3461,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":402
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":402
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3481,7 +3471,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":403
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":403
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3490,7 +3480,7 @@
  */
       __pyx_v_on_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":404
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":404
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3499,7 +3489,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":405
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":405
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -3508,7 +3498,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":406
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":406
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -3517,7 +3507,7 @@
  */
       PyArray_MultiIter_NEXTi(__pyx_v_multi, 1);
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":407
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":407
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)             # <<<<<<<<<<<<<<
@@ -3529,7 +3519,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":409
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":409
  *             PyArray_MultiIter_NEXTi(multi, 2)
  * 
  *     return array             # <<<<<<<<<<<<<<
@@ -3560,7 +3550,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":411
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":411
  *     return array
  * 
  * cdef object discnmN_array_sc(rk_state *state, rk_discnmN func, object size,             # <<<<<<<<<<<<<<
@@ -3583,7 +3573,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":418
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":418
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3593,7 +3583,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":419
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":419
  * 
  *     if size is None:
  *         return func(state, n, m, N)             # <<<<<<<<<<<<<<
@@ -3610,7 +3600,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":421
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":421
  *         return func(state, n, m, N)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3639,7 +3629,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":422
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":422
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -3648,7 +3638,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":423
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":423
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3657,7 +3647,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":424
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":424
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -3667,7 +3657,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":425
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":425
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, m, N)             # <<<<<<<<<<<<<<
@@ -3677,7 +3667,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_n, __pyx_v_m, __pyx_v_N);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":426
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":426
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, m, N)
  *         return array             # <<<<<<<<<<<<<<
@@ -3707,7 +3697,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":428
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":428
  *         return array
  * 
  * cdef object discnmN_array(rk_state *state, rk_discnmN func, object size,             # <<<<<<<<<<<<<<
@@ -3737,7 +3727,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":439
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":439
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3747,7 +3737,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":440
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":440
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>on, <void *>om, <void *>oN)             # <<<<<<<<<<<<<<
@@ -3761,7 +3751,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":441
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":441
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>on, <void *>om, <void *>oN)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -3775,7 +3765,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":442
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":442
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>on, <void *>om, <void *>oN)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3784,7 +3774,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":443
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":443
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3794,7 +3784,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":444
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":444
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -3803,7 +3793,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":445
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":445
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3812,7 +3802,7 @@
  */
       __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":446
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":446
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3821,7 +3811,7 @@
  */
       __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":447
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":447
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])             # <<<<<<<<<<<<<<
@@ -3830,7 +3820,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_om_data[0]), (__pyx_v_oN_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":448
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":448
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -3843,7 +3833,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":450
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":450
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3872,7 +3862,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":451
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":451
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3881,7 +3871,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":453
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":453
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>on, <void *>om,
  *                                                 <void *>oN)             # <<<<<<<<<<<<<<
@@ -3895,7 +3885,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":454
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":454
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>on, <void *>om,
  *                                                 <void *>oN)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -3905,7 +3895,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":455
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":455
  *                                                 <void *>oN)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -3927,7 +3917,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":456
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":456
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3937,7 +3927,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":457
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":457
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3946,7 +3936,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":458
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":458
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3955,7 +3945,7 @@
  */
       __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":459
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":459
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 3)             # <<<<<<<<<<<<<<
@@ -3964,7 +3954,7 @@
  */
       __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 3));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":460
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":460
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])             # <<<<<<<<<<<<<<
@@ -3973,7 +3963,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_om_data[0]), (__pyx_v_oN_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":461
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":461
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -3985,7 +3975,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":463
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":463
  *             PyArray_MultiIter_NEXT(multi)
  * 
  *     return array             # <<<<<<<<<<<<<<
@@ -4017,7 +4007,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":465
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":465
  *     return array
  * 
  * cdef object discd_array_sc(rk_state *state, rk_discd func, object size, double a):             # <<<<<<<<<<<<<<
@@ -4040,7 +4030,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":471
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":471
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -4050,7 +4040,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":472
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":472
  * 
  *     if size is None:
  *         return func(state, a)             # <<<<<<<<<<<<<<
@@ -4067,7 +4057,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":474
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":474
  *         return func(state, a)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -4096,7 +4086,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":475
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":475
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -4105,7 +4095,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":476
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":476
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -4114,7 +4104,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":477
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":477
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -4124,7 +4114,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":478
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":478
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)             # <<<<<<<<<<<<<<
@@ -4134,7 +4124,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":479
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":479
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)
  *         return array             # <<<<<<<<<<<<<<
@@ -4164,7 +4154,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":481
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":481
  *         return array
  * 
  * cdef object discd_array(rk_state *state, rk_discd func, object size, ndarray oa):             # <<<<<<<<<<<<<<
@@ -4193,7 +4183,7 @@
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":490
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":490
  *     cdef flatiter itera
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -4203,7 +4193,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":491
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":491
  * 
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -4217,7 +4207,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":492
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":492
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_LONG)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -4226,7 +4216,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":493
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":493
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_LONG)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -4235,7 +4225,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":494
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":494
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)             # <<<<<<<<<<<<<<
@@ -4249,7 +4239,7 @@
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":495
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":495
  *         array_data = <long *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -4259,7 +4249,7 @@
     __pyx_t_3 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":496
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":496
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])             # <<<<<<<<<<<<<<
@@ -4268,7 +4258,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":497
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":497
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])
  *             PyArray_ITER_NEXT(itera)             # <<<<<<<<<<<<<<
@@ -4281,7 +4271,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":499
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":499
  *             PyArray_ITER_NEXT(itera)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -4310,7 +4300,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":500
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":500
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -4319,7 +4309,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":501
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":501
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array, <void *>oa)             # <<<<<<<<<<<<<<
@@ -4333,7 +4323,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":502
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":502
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array, <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -4343,7 +4333,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":503
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":503
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array, <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -4365,7 +4355,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":504
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":504
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -4375,7 +4365,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":505
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":505
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -4384,7 +4374,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":506
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":506
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])             # <<<<<<<<<<<<<<
@@ -4393,7 +4383,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":507
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":507
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -4405,7 +4395,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":508
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":508
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *     return array             # <<<<<<<<<<<<<<
@@ -4436,7 +4426,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":510
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":510
  *     return array
  * 
  * cdef double kahan_sum(double *darr, long n):             # <<<<<<<<<<<<<<
@@ -4454,7 +4444,7 @@
   long __pyx_t_1;
   __Pyx_RefNannySetupContext("kahan_sum");
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":513
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":513
  *     cdef double c, y, t, sum
  *     cdef long i
  *     sum = darr[0]             # <<<<<<<<<<<<<<
@@ -4463,7 +4453,7 @@
  */
   __pyx_v_sum = (__pyx_v_darr[0]);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":514
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":514
  *     cdef long i
  *     sum = darr[0]
  *     c = 0.0             # <<<<<<<<<<<<<<
@@ -4472,7 +4462,7 @@
  */
   __pyx_v_c = 0.0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":515
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":515
  *     sum = darr[0]
  *     c = 0.0
  *     for i from 1 <= i < n:             # <<<<<<<<<<<<<<
@@ -4482,7 +4472,7 @@
   __pyx_t_1 = __pyx_v_n;
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":516
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":516
  *     c = 0.0
  *     for i from 1 <= i < n:
  *         y = darr[i] - c             # <<<<<<<<<<<<<<
@@ -4491,7 +4481,7 @@
  */
     __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":517
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":517
  *     for i from 1 <= i < n:
  *         y = darr[i] - c
  *         t = sum + y             # <<<<<<<<<<<<<<
@@ -4500,7 +4490,7 @@
  */
     __pyx_v_t = (__pyx_v_sum + __pyx_v_y);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":518
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":518
  *         y = darr[i] - c
  *         t = sum + y
  *         c = (t-sum) - y             # <<<<<<<<<<<<<<
@@ -4509,7 +4499,7 @@
  */
     __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":519
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":519
  *         t = sum + y
  *         c = (t-sum) - y
  *         sum = t             # <<<<<<<<<<<<<<
@@ -4519,7 +4509,7 @@
     __pyx_v_sum = __pyx_v_t;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":520
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":520
  *         c = (t-sum) - y
  *         sum = t
  *     return sum             # <<<<<<<<<<<<<<
@@ -4535,7 +4525,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":557
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":557
  *     cdef rk_state *internal_state
  * 
  *     def __init__(self, seed=None):             # <<<<<<<<<<<<<<
@@ -4588,7 +4578,7 @@
   return -1;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":558
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":558
  * 
  *     def __init__(self, seed=None):
  *         self.internal_state = <rk_state*>PyMem_Malloc(sizeof(rk_state))             # <<<<<<<<<<<<<<
@@ -4597,7 +4587,7 @@
  */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state *)PyMem_Malloc((sizeof(rk_state))));
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":560
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":560
  *         self.internal_state = <rk_state*>PyMem_Malloc(sizeof(rk_state))
  * 
  *         self.seed(seed)             # <<<<<<<<<<<<<<
@@ -4630,7 +4620,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":562
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":562
  *         self.seed(seed)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -4644,7 +4634,7 @@
   __Pyx_RefNannySetupContext("__dealloc__");
   __Pyx_INCREF((PyObject *)__pyx_v_self);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":563
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":563
  * 
  *     def __dealloc__(self):
  *         if self.internal_state != NULL:             # <<<<<<<<<<<<<<
@@ -4654,7 +4644,7 @@
   __pyx_t_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != NULL);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":564
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":564
  *     def __dealloc__(self):
  *         if self.internal_state != NULL:
  *             PyMem_Free(self.internal_state)             # <<<<<<<<<<<<<<
@@ -4663,7 +4653,7 @@
  */
     PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":565
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":565
  *         if self.internal_state != NULL:
  *             PyMem_Free(self.internal_state)
  *             self.internal_state = NULL             # <<<<<<<<<<<<<<
@@ -4679,7 +4669,7 @@
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":567
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":567
  *             self.internal_state = NULL
  * 
  *     def seed(self, seed=None):             # <<<<<<<<<<<<<<
@@ -4696,8 +4686,8 @@
   PyObject *__pyx_v_iseed;
   PyObject *__pyx_r = NULL;
   int __pyx_t_1;
-  unsigned long __pyx_t_2;
-  PyObject *__pyx_t_3 = NULL;
+  PyObject *__pyx_t_2 = NULL;
+  unsigned long __pyx_t_3;
   PyObject *__pyx_t_4 = NULL;
   static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__seed,0};
   __Pyx_RefNannySetupContext("seed");
@@ -4741,7 +4731,7 @@
   arrayObject_obj = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_iseed = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":588
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":588
  *         cdef rk_error errcode
  *         cdef ndarray obj "arrayObject_obj"
  *         if seed is None:             # <<<<<<<<<<<<<<
@@ -4751,7 +4741,7 @@
   __pyx_t_1 = (__pyx_v_seed == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":589
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":589
  *         cdef ndarray obj "arrayObject_obj"
  *         if seed is None:
  *             errcode = rk_randomseed(self.internal_state)             # <<<<<<<<<<<<<<
@@ -4762,45 +4752,48 @@
     goto __pyx_L6;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":590
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":590
  *         if seed is None:
  *             errcode = rk_randomseed(self.internal_state)
  *         elif type(seed) is int:             # <<<<<<<<<<<<<<
  *             rk_seed(seed, self.internal_state)
  *         elif isinstance(seed, np.integer):
  */
-  __pyx_t_1 = (((PyObject *)Py_TYPE(__pyx_v_seed)) == ((PyObject *)((PyObject*)&PyInt_Type)));
+  __pyx_t_2 = ((PyObject *)__Pyx_Type(__pyx_v_seed)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 590; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __pyx_t_1 = (__pyx_t_2 == ((PyObject*)&PyInt_Type));
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":591
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":591
  *             errcode = rk_randomseed(self.internal_state)
  *         elif type(seed) is int:
  *             rk_seed(seed, self.internal_state)             # <<<<<<<<<<<<<<
  *         elif isinstance(seed, np.integer):
  *             iseed = int(seed)
  */
-    __pyx_t_2 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_seed); if (unlikely((__pyx_t_2 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    rk_seed(__pyx_t_2, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
+    __pyx_t_3 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_seed); if (unlikely((__pyx_t_3 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    rk_seed(__pyx_t_3, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L6;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":592
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":592
  *         elif type(seed) is int:
  *             rk_seed(seed, self.internal_state)
  *         elif isinstance(seed, np.integer):             # <<<<<<<<<<<<<<
  *             iseed = int(seed)
  *             rk_seed(iseed, self.internal_state)
  */
-  __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__integer); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__integer); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_t_1 = PyObject_IsInstance(__pyx_v_seed, __pyx_t_4); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":593
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":593
  *             rk_seed(seed, self.internal_state)
  *         elif isinstance(seed, np.integer):
  *             iseed = int(seed)             # <<<<<<<<<<<<<<
@@ -4812,41 +4805,41 @@
     __Pyx_INCREF(__pyx_v_seed);
     PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_seed);
     __Pyx_GIVEREF(__pyx_v_seed);
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_v_iseed);
-    __pyx_v_iseed = __pyx_t_3;
-    __pyx_t_3 = 0;
+    __pyx_v_iseed = __pyx_t_2;
+    __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":594
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":594
  *         elif isinstance(seed, np.integer):
  *             iseed = int(seed)
  *             rk_seed(iseed, self.internal_state)             # <<<<<<<<<<<<<<
  *         else:
  *             obj = <ndarray>PyArray_ContiguousFromObject(seed, NPY_LONG, 1, 1)
  */
-    __pyx_t_2 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_iseed); if (unlikely((__pyx_t_2 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    rk_seed(__pyx_t_2, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
+    __pyx_t_3 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_iseed); if (unlikely((__pyx_t_3 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    rk_seed(__pyx_t_3, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L6;
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":596
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":596
  *             rk_seed(iseed, self.internal_state)
  *         else:
  *             obj = <ndarray>PyArray_ContiguousFromObject(seed, NPY_LONG, 1, 1)             # <<<<<<<<<<<<<<
  *             init_by_array(self.internal_state, <unsigned long *>(obj.data),
  *                 obj.dimensions[0])
  */
-    __pyx_t_3 = PyArray_ContiguousFromObject(__pyx_v_seed, NPY_LONG, 1, 1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_t_3)));
+    __pyx_t_2 = PyArray_ContiguousFromObject(__pyx_v_seed, NPY_LONG, 1, 1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_t_2)));
     __Pyx_DECREF(((PyObject *)arrayObject_obj));
-    arrayObject_obj = ((PyArrayObject *)__pyx_t_3);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    arrayObject_obj = ((PyArrayObject *)__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":598
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":598
  *             obj = <ndarray>PyArray_ContiguousFromObject(seed, NPY_LONG, 1, 1)
  *             init_by_array(self.internal_state, <unsigned long *>(obj.data),
  *                 obj.dimensions[0])             # <<<<<<<<<<<<<<
@@ -4860,7 +4853,7 @@
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_3);
+  __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_4);
   __Pyx_AddTraceback("mtrand.RandomState.seed");
   __pyx_r = NULL;
@@ -4874,7 +4867,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":600
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":600
  *                 obj.dimensions[0])
  * 
  *     def get_state(self):             # <<<<<<<<<<<<<<
@@ -4894,7 +4887,7 @@
   __Pyx_RefNannySetupContext("get_state");
   arrayObject_state = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":631
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":631
  *         """
  *         cdef ndarray state "arrayObject_state"
  *         state = <ndarray>np.empty(624, np.uint)             # <<<<<<<<<<<<<<
@@ -4928,7 +4921,7 @@
   arrayObject_state = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":632
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":632
  *         cdef ndarray state "arrayObject_state"
  *         state = <ndarray>np.empty(624, np.uint)
  *         memcpy(<void*>(state.data), <void*>(self.internal_state.key), 624*sizeof(long))             # <<<<<<<<<<<<<<
@@ -4937,7 +4930,7 @@
  */
   memcpy(((void *)arrayObject_state->data), ((void *)((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key), (624 * (sizeof(long))));
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":633
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":633
  *         state = <ndarray>np.empty(624, np.uint)
  *         memcpy(<void*>(state.data), <void*>(self.internal_state.key), 624*sizeof(long))
  *         state = <ndarray>np.asarray(state, np.uint32)             # <<<<<<<<<<<<<<
@@ -4971,7 +4964,7 @@
   arrayObject_state = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":634
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":634
  *         memcpy(<void*>(state.data), <void*>(self.internal_state.key), 624*sizeof(long))
  *         state = <ndarray>np.asarray(state, np.uint32)
  *         return ('MT19937', state, self.internal_state.pos,             # <<<<<<<<<<<<<<
@@ -4982,7 +4975,7 @@
   __pyx_t_2 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":635
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":635
  *         state = <ndarray>np.asarray(state, np.uint32)
  *         return ('MT19937', state, self.internal_state.pos,
  *             self.internal_state.has_gauss, self.internal_state.gauss)             # <<<<<<<<<<<<<<
@@ -5030,7 +5023,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":637
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":637
  *             self.internal_state.has_gauss, self.internal_state.gauss)
  * 
  *     def set_state(self, state):             # <<<<<<<<<<<<<<
@@ -5065,7 +5058,7 @@
   __pyx_v_has_gauss = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_cached_gaussian = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":686
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":686
  *         cdef ndarray obj "arrayObject_obj"
  *         cdef int pos
  *         algorithm_name = state[0]             # <<<<<<<<<<<<<<
@@ -5078,7 +5071,7 @@
   __pyx_v_algorithm_name = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":687
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":687
  *         cdef int pos
  *         algorithm_name = state[0]
  *         if algorithm_name != 'MT19937':             # <<<<<<<<<<<<<<
@@ -5091,7 +5084,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_2) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":688
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":688
  *         algorithm_name = state[0]
  *         if algorithm_name != 'MT19937':
  *             raise ValueError("algorithm must be 'MT19937'")             # <<<<<<<<<<<<<<
@@ -5113,7 +5106,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":689
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":689
  *         if algorithm_name != 'MT19937':
  *             raise ValueError("algorithm must be 'MT19937'")
  *         key, pos = state[1:3]             # <<<<<<<<<<<<<<
@@ -5151,7 +5144,7 @@
     __pyx_v_pos = __pyx_t_5;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":690
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":690
  *             raise ValueError("algorithm must be 'MT19937'")
  *         key, pos = state[1:3]
  *         if len(state) == 3:             # <<<<<<<<<<<<<<
@@ -5162,7 +5155,7 @@
   __pyx_t_2 = (__pyx_t_7 == 3);
   if (__pyx_t_2) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":691
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":691
  *         key, pos = state[1:3]
  *         if len(state) == 3:
  *             has_gauss = 0             # <<<<<<<<<<<<<<
@@ -5173,7 +5166,7 @@
     __Pyx_DECREF(__pyx_v_has_gauss);
     __pyx_v_has_gauss = __pyx_int_0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":692
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":692
  *         if len(state) == 3:
  *             has_gauss = 0
  *             cached_gaussian = 0.0             # <<<<<<<<<<<<<<
@@ -5189,7 +5182,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":694
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":694
  *             cached_gaussian = 0.0
  *         else:
  *             has_gauss, cached_gaussian = state[3:5]             # <<<<<<<<<<<<<<
@@ -5229,7 +5222,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":695
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":695
  *         else:
  *             has_gauss, cached_gaussian = state[3:5]
  *         try:             # <<<<<<<<<<<<<<
@@ -5244,7 +5237,7 @@
     __Pyx_XGOTREF(__pyx_save_exc_tb);
     /*try:*/ {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":696
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":696
  *             has_gauss, cached_gaussian = state[3:5]
  *         try:
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_ULONG, 1, 1)             # <<<<<<<<<<<<<<
@@ -5268,7 +5261,7 @@
     __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":697
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":697
  *         try:
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_ULONG, 1, 1)
  *         except TypeError:             # <<<<<<<<<<<<<<
@@ -5283,7 +5276,7 @@
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_GOTREF(__pyx_t_4);
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":699
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":699
  *         except TypeError:
  *             # compatibility -- could be an older pickle
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_LONG, 1, 1)             # <<<<<<<<<<<<<<
@@ -5315,7 +5308,7 @@
     __pyx_L14_try_end:;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":700
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":700
  *             # compatibility -- could be an older pickle
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_LONG, 1, 1)
  *         if obj.dimensions[0] != 624:             # <<<<<<<<<<<<<<
@@ -5325,7 +5318,7 @@
   __pyx_t_2 = ((arrayObject_obj->dimensions[0]) != 624);
   if (__pyx_t_2) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":701
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":701
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_LONG, 1, 1)
  *         if obj.dimensions[0] != 624:
  *             raise ValueError("state must be 624 longs")             # <<<<<<<<<<<<<<
@@ -5347,7 +5340,7 @@
   }
   __pyx_L17:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":702
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":702
  *         if obj.dimensions[0] != 624:
  *             raise ValueError("state must be 624 longs")
  *         memcpy(<void*>(self.internal_state.key), <void*>(obj.data), 624*sizeof(long))             # <<<<<<<<<<<<<<
@@ -5356,7 +5349,7 @@
  */
   memcpy(((void *)((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key), ((void *)arrayObject_obj->data), (624 * (sizeof(long))));
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":703
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":703
  *             raise ValueError("state must be 624 longs")
  *         memcpy(<void*>(self.internal_state.key), <void*>(obj.data), 624*sizeof(long))
  *         self.internal_state.pos = pos             # <<<<<<<<<<<<<<
@@ -5365,7 +5358,7 @@
  */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":704
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":704
  *         memcpy(<void*>(self.internal_state.key), <void*>(obj.data), 624*sizeof(long))
  *         self.internal_state.pos = pos
  *         self.internal_state.has_gauss = has_gauss             # <<<<<<<<<<<<<<
@@ -5375,14 +5368,14 @@
   __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_v_has_gauss); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->has_gauss = __pyx_t_5;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":705
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":705
  *         self.internal_state.pos = pos
  *         self.internal_state.has_gauss = has_gauss
  *         self.internal_state.gauss = cached_gaussian             # <<<<<<<<<<<<<<
  * 
  *     # Pickling support:
  */
-  __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_cached_gaussian); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_cached_gaussian); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->gauss = __pyx_t_8;
 
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
@@ -5407,7 +5400,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":708
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":708
  * 
  *     # Pickling support:
  *     def __getstate__(self):             # <<<<<<<<<<<<<<
@@ -5422,7 +5415,7 @@
   PyObject *__pyx_t_2 = NULL;
   __Pyx_RefNannySetupContext("__getstate__");
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":709
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":709
  *     # Pickling support:
  *     def __getstate__(self):
  *         return self.get_state()             # <<<<<<<<<<<<<<
@@ -5452,7 +5445,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":711
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":711
  *         return self.get_state()
  * 
  *     def __setstate__(self, state):             # <<<<<<<<<<<<<<
@@ -5468,7 +5461,7 @@
   PyObject *__pyx_t_3 = NULL;
   __Pyx_RefNannySetupContext("__setstate__");
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":712
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":712
  * 
  *     def __setstate__(self, state):
  *         self.set_state(state)             # <<<<<<<<<<<<<<
@@ -5502,7 +5495,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":714
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":714
  *         self.set_state(state)
  * 
  *     def __reduce__(self):             # <<<<<<<<<<<<<<
@@ -5518,7 +5511,7 @@
   PyObject *__pyx_t_3 = NULL;
   __Pyx_RefNannySetupContext("__reduce__");
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":715
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":715
  * 
  *     def __reduce__(self):
  *         return (np.random.__RandomState_ctor, (), self.get_state())             # <<<<<<<<<<<<<<
@@ -5568,7 +5561,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":718
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":718
  * 
  *     # Basic distributions:
  *     def random_sample(self, size=None):             # <<<<<<<<<<<<<<
@@ -5620,7 +5613,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":759
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":759
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_double, size)             # <<<<<<<<<<<<<<
@@ -5646,7 +5639,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":761
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":761
  *         return cont0_array(self.internal_state, rk_double, size)
  * 
  *     def tomaxint(self, size=None):             # <<<<<<<<<<<<<<
@@ -5698,7 +5691,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":787
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":787
  * 
  *         """
  *         return disc0_array(self.internal_state, rk_long, size)             # <<<<<<<<<<<<<<
@@ -5724,7 +5717,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":789
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":789
  *         return disc0_array(self.internal_state, rk_long, size)
  * 
  *     def randint(self, low, high=None, size=None):             # <<<<<<<<<<<<<<
@@ -5811,7 +5804,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":845
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":845
  *         cdef long i
  * 
  *         if high is None:             # <<<<<<<<<<<<<<
@@ -5821,7 +5814,7 @@
   __pyx_t_1 = (__pyx_v_high == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":846
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":846
  * 
  *         if high is None:
  *             lo = 0             # <<<<<<<<<<<<<<
@@ -5830,7 +5823,7 @@
  */
     __pyx_v_lo = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":847
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":847
  *         if high is None:
  *             lo = 0
  *             hi = low             # <<<<<<<<<<<<<<
@@ -5843,7 +5836,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":849
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":849
  *             hi = low
  *         else:
  *             lo = low             # <<<<<<<<<<<<<<
@@ -5853,7 +5846,7 @@
     __pyx_t_2 = __Pyx_PyInt_AsLong(__pyx_v_low); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_lo = __pyx_t_2;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":850
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":850
  *         else:
  *             lo = low
  *             hi = high             # <<<<<<<<<<<<<<
@@ -5865,7 +5858,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":852
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":852
  *             hi = high
  * 
  *         diff = hi - lo - 1             # <<<<<<<<<<<<<<
@@ -5874,7 +5867,7 @@
  */
   __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":853
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":853
  * 
  *         diff = hi - lo - 1
  *         if diff < 0:             # <<<<<<<<<<<<<<
@@ -5884,7 +5877,7 @@
   __pyx_t_1 = (__pyx_v_diff < 0);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":854
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":854
  *         diff = hi - lo - 1
  *         if diff < 0:
  *             raise ValueError("low >= high")             # <<<<<<<<<<<<<<
@@ -5906,7 +5899,7 @@
   }
   __pyx_L7:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":856
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":856
  *             raise ValueError("low >= high")
  * 
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -5916,7 +5909,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":857
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":857
  * 
  *         if size is None:
  *             return <long>rk_interval(diff, self.internal_state) + lo             # <<<<<<<<<<<<<<
@@ -5933,7 +5926,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":859
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":859
  *             return <long>rk_interval(diff, self.internal_state) + lo
  *         else:
  *             array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -5962,7 +5955,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":860
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":860
  *         else:
  *             array = <ndarray>np.empty(size, int)
  *             length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -5971,7 +5964,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":861
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":861
  *             array = <ndarray>np.empty(size, int)
  *             length = PyArray_SIZE(array)
  *             array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -5980,7 +5973,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":862
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":862
  *             length = PyArray_SIZE(array)
  *             array_data = <long *>array.data
  *             for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -5990,7 +5983,7 @@
     __pyx_t_2 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":863
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":863
  *             array_data = <long *>array.data
  *             for i from 0 <= i < length:
  *                 array_data[i] = lo + <long>rk_interval(diff, self.internal_state)             # <<<<<<<<<<<<<<
@@ -6000,7 +5993,7 @@
       (__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)));
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":864
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":864
  *             for i from 0 <= i < length:
  *                 array_data[i] = lo + <long>rk_interval(diff, self.internal_state)
  *             return array             # <<<<<<<<<<<<<<
@@ -6033,7 +6026,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":866
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":866
  *             return array
  * 
  *     def bytes(self, unsigned int length):             # <<<<<<<<<<<<<<
@@ -6060,7 +6053,7 @@
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_bytestring = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":889
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":889
  *         """
  *         cdef void *bytes
  *         bytestring = empty_py_bytes(length, &bytes)             # <<<<<<<<<<<<<<
@@ -6073,7 +6066,7 @@
   __pyx_v_bytestring = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":890
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":890
  *         cdef void *bytes
  *         bytestring = empty_py_bytes(length, &bytes)
  *         rk_fill(bytes, length, self.internal_state)             # <<<<<<<<<<<<<<
@@ -6082,7 +6075,7 @@
  */
   rk_fill(__pyx_v_bytes, __pyx_v_length, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":891
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":891
  *         bytestring = empty_py_bytes(length, &bytes)
  *         rk_fill(bytes, length, self.internal_state)
  *         return bytestring             # <<<<<<<<<<<<<<
@@ -6107,7 +6100,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":893
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":893
  *         return bytestring
  * 
  *     def uniform(self, low=0.0, high=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -6198,7 +6191,7 @@
   __pyx_v_odiff = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_temp = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":968
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":968
  *         cdef object temp
  * 
  *         flow = PyFloat_AsDouble(low)             # <<<<<<<<<<<<<<
@@ -6207,7 +6200,7 @@
  */
   __pyx_v_flow = PyFloat_AsDouble(__pyx_v_low);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":969
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":969
  * 
  *         flow = PyFloat_AsDouble(low)
  *         fhigh = PyFloat_AsDouble(high)             # <<<<<<<<<<<<<<
@@ -6216,7 +6209,7 @@
  */
   __pyx_v_fhigh = PyFloat_AsDouble(__pyx_v_high);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":970
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":970
  *         flow = PyFloat_AsDouble(low)
  *         fhigh = PyFloat_AsDouble(high)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -6226,7 +6219,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":971
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":971
  *         fhigh = PyFloat_AsDouble(high)
  *         if not PyErr_Occurred():
  *             return cont2_array_sc(self.internal_state, rk_uniform, size, flow, fhigh-flow)             # <<<<<<<<<<<<<<
@@ -6243,7 +6236,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":972
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":972
  *         if not PyErr_Occurred():
  *             return cont2_array_sc(self.internal_state, rk_uniform, size, flow, fhigh-flow)
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -6252,7 +6245,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":973
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":973
  *             return cont2_array_sc(self.internal_state, rk_uniform, size, flow, fhigh-flow)
  *         PyErr_Clear()
  *         olow = <ndarray>PyArray_FROM_OTF(low, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6266,7 +6259,7 @@
   __pyx_v_olow = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":974
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":974
  *         PyErr_Clear()
  *         olow = <ndarray>PyArray_FROM_OTF(low, NPY_DOUBLE, NPY_ALIGNED)
  *         ohigh = <ndarray>PyArray_FROM_OTF(high, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6280,7 +6273,7 @@
   __pyx_v_ohigh = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":975
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":975
  *         olow = <ndarray>PyArray_FROM_OTF(low, NPY_DOUBLE, NPY_ALIGNED)
  *         ohigh = <ndarray>PyArray_FROM_OTF(high, NPY_DOUBLE, NPY_ALIGNED)
  *         temp = np.subtract(ohigh, olow)             # <<<<<<<<<<<<<<
@@ -6308,7 +6301,7 @@
   __pyx_v_temp = __pyx_t_4;
   __pyx_t_4 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":976
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":976
  *         ohigh = <ndarray>PyArray_FROM_OTF(high, NPY_DOUBLE, NPY_ALIGNED)
  *         temp = np.subtract(ohigh, olow)
  *         Py_INCREF(temp) # needed to get around Pyrex's automatic reference-counting             # <<<<<<<<<<<<<<
@@ -6317,7 +6310,7 @@
  */
   Py_INCREF(__pyx_v_temp);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":978
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":978
  *         Py_INCREF(temp) # needed to get around Pyrex's automatic reference-counting
  *                         #  rules because EnsureArray steals a reference
  *         odiff = <ndarray>PyArray_EnsureArray(temp)             # <<<<<<<<<<<<<<
@@ -6331,7 +6324,7 @@
   __pyx_v_odiff = ((PyArrayObject *)__pyx_t_4);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":979
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":979
  *                         #  rules because EnsureArray steals a reference
  *         odiff = <ndarray>PyArray_EnsureArray(temp)
  *         return cont2_array(self.internal_state, rk_uniform, size, olow, odiff)             # <<<<<<<<<<<<<<
@@ -6367,7 +6360,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":981
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":981
  *         return cont2_array(self.internal_state, rk_uniform, size, olow, odiff)
  * 
  *     def rand(self, *args):             # <<<<<<<<<<<<<<
@@ -6391,7 +6384,7 @@
   __pyx_v_args = __pyx_args;
   __Pyx_INCREF((PyObject *)__pyx_v_self);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1019
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1019
  * 
  *         """
  *         if len(args) == 0:             # <<<<<<<<<<<<<<
@@ -6402,7 +6395,7 @@
   __pyx_t_2 = (__pyx_t_1 == 0);
   if (__pyx_t_2) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1020
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1020
  *         """
  *         if len(args) == 0:
  *             return self.random_sample()             # <<<<<<<<<<<<<<
@@ -6422,7 +6415,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1022
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1022
  *             return self.random_sample()
  *         else:
  *             return self.random_sample(size=args)             # <<<<<<<<<<<<<<
@@ -6461,7 +6454,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1024
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1024
  *             return self.random_sample(size=args)
  * 
  *     def randn(self, *args):             # <<<<<<<<<<<<<<
@@ -6485,7 +6478,7 @@
   __pyx_v_args = __pyx_args;
   __Pyx_INCREF((PyObject *)__pyx_v_self);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1075
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1075
  * 
  *         """
  *         if len(args) == 0:             # <<<<<<<<<<<<<<
@@ -6496,7 +6489,7 @@
   __pyx_t_2 = (__pyx_t_1 == 0);
   if (__pyx_t_2) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1076
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1076
  *         """
  *         if len(args) == 0:
  *             return self.standard_normal()             # <<<<<<<<<<<<<<
@@ -6516,7 +6509,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1078
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1078
  *             return self.standard_normal()
  *         else:
  *             return self.standard_normal(args)             # <<<<<<<<<<<<<<
@@ -6557,7 +6550,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1080
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1080
  *             return self.standard_normal(args)
  * 
  *     def random_integers(self, low, high=None, size=None):             # <<<<<<<<<<<<<<
@@ -6635,7 +6628,7 @@
   __Pyx_INCREF(__pyx_v_high);
   __Pyx_INCREF(__pyx_v_size);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1152
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1152
  * 
  *         """
  *         if high is None:             # <<<<<<<<<<<<<<
@@ -6645,7 +6638,7 @@
   __pyx_t_1 = (__pyx_v_high == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1153
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1153
  *         """
  *         if high is None:
  *             high = low             # <<<<<<<<<<<<<<
@@ -6656,7 +6649,7 @@
     __Pyx_DECREF(__pyx_v_high);
     __pyx_v_high = __pyx_v_low;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1154
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1154
  *         if high is None:
  *             high = low
  *             low = 1             # <<<<<<<<<<<<<<
@@ -6670,7 +6663,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1155
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1155
  *             high = low
  *             low = 1
  *         return self.randint(low, high+1, size)             # <<<<<<<<<<<<<<
@@ -6719,7 +6712,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1158
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1158
  * 
  *     # Complicated, continuous distributions:
  *     def standard_normal(self, size=None):             # <<<<<<<<<<<<<<
@@ -6771,7 +6764,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1188
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1188
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_gauss, size)             # <<<<<<<<<<<<<<
@@ -6797,7 +6790,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1190
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1190
  *         return cont0_array(self.internal_state, rk_gauss, size)
  * 
  *     def normal(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -6885,7 +6878,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1275
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1275
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -6894,7 +6887,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1276
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1276
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -6903,7 +6896,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1277
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1277
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -6913,7 +6906,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1278
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1278
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -6923,7 +6916,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1279
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1279
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -6945,7 +6938,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1280
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1280
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_normal, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -6962,7 +6955,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1282
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1282
  *             return cont2_array_sc(self.internal_state, rk_normal, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -6971,7 +6964,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1284
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1284
  *         PyErr_Clear()
  * 
  *         oloc = <ndarray>PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6985,7 +6978,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1285
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1285
  * 
  *         oloc = <ndarray>PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6999,7 +6992,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1286
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1286
  *         oloc = <ndarray>PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0)):             # <<<<<<<<<<<<<<
@@ -7041,7 +7034,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1287
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1287
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -7063,7 +7056,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1288
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1288
  *         if np.any(np.less_equal(oscale, 0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_normal, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -7098,7 +7091,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1290
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1290
  *         return cont2_array(self.internal_state, rk_normal, size, oloc, oscale)
  * 
  *     def beta(self, a, b, size=None):             # <<<<<<<<<<<<<<
@@ -7184,7 +7177,7 @@
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_ob = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1330
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1330
  *         cdef double fa, fb
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -7193,7 +7186,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1331
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1331
  * 
  *         fa = PyFloat_AsDouble(a)
  *         fb = PyFloat_AsDouble(b)             # <<<<<<<<<<<<<<
@@ -7202,7 +7195,7 @@
  */
   __pyx_v_fb = PyFloat_AsDouble(__pyx_v_b);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1332
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1332
  *         fa = PyFloat_AsDouble(a)
  *         fb = PyFloat_AsDouble(b)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -7212,7 +7205,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1333
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1333
  *         fb = PyFloat_AsDouble(b)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -7222,7 +7215,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1334
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1334
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -7244,7 +7237,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1335
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1335
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             if fb <= 0:             # <<<<<<<<<<<<<<
@@ -7254,7 +7247,7 @@
     __pyx_t_1 = (__pyx_v_fb <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1336
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1336
  *                 raise ValueError("a <= 0")
  *             if fb <= 0:
  *                 raise ValueError("b <= 0")             # <<<<<<<<<<<<<<
@@ -7276,7 +7269,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1337
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1337
  *             if fb <= 0:
  *                 raise ValueError("b <= 0")
  *             return cont2_array_sc(self.internal_state, rk_beta, size, fa, fb)             # <<<<<<<<<<<<<<
@@ -7293,7 +7286,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1339
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1339
  *             return cont2_array_sc(self.internal_state, rk_beta, size, fa, fb)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -7302,7 +7295,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1341
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1341
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7316,7 +7309,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1342
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1342
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         ob = <ndarray>PyArray_FROM_OTF(b, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7330,7 +7323,7 @@
   __pyx_v_ob = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1343
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1343
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         ob = <ndarray>PyArray_FROM_OTF(b, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0)):             # <<<<<<<<<<<<<<
@@ -7372,7 +7365,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1344
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1344
  *         ob = <ndarray>PyArray_FROM_OTF(b, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -7394,7 +7387,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1345
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1345
  *         if np.any(np.less_equal(oa, 0)):
  *             raise ValueError("a <= 0")
  *         if np.any(np.less_equal(ob, 0)):             # <<<<<<<<<<<<<<
@@ -7436,7 +7429,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1346
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1346
  *             raise ValueError("a <= 0")
  *         if np.any(np.less_equal(ob, 0)):
  *             raise ValueError("b <= 0")             # <<<<<<<<<<<<<<
@@ -7458,7 +7451,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1347
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1347
  *         if np.any(np.less_equal(ob, 0)):
  *             raise ValueError("b <= 0")
  *         return cont2_array(self.internal_state, rk_beta, size, oa, ob)             # <<<<<<<<<<<<<<
@@ -7493,7 +7486,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1349
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1349
  *         return cont2_array(self.internal_state, rk_beta, size, oa, ob)
  * 
  *     def exponential(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -7566,7 +7559,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1390
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1390
  *         cdef double fscale
  * 
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -7575,7 +7568,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1391
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1391
  * 
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -7585,7 +7578,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1392
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1392
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -7595,7 +7588,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1393
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1393
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -7617,7 +7610,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1394
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1394
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont1_array_sc(self.internal_state, rk_exponential, size, fscale)             # <<<<<<<<<<<<<<
@@ -7634,7 +7627,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1396
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1396
  *             return cont1_array_sc(self.internal_state, rk_exponential, size, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -7643,7 +7636,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1398
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1398
  *         PyErr_Clear()
  * 
  *         oscale = <ndarray> PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7657,7 +7650,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1399
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1399
  * 
  *         oscale = <ndarray> PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -7701,7 +7694,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1400
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1400
  *         oscale = <ndarray> PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -7723,7 +7716,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1401
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1401
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont1_array(self.internal_state, rk_exponential, size, oscale)             # <<<<<<<<<<<<<<
@@ -7756,7 +7749,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1403
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1403
  *         return cont1_array(self.internal_state, rk_exponential, size, oscale)
  * 
  *     def standard_exponential(self, size=None):             # <<<<<<<<<<<<<<
@@ -7808,7 +7801,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1429
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1429
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_standard_exponential, size)             # <<<<<<<<<<<<<<
@@ -7834,7 +7827,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1431
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1431
  *         return cont0_array(self.internal_state, rk_standard_exponential, size)
  * 
  *     def standard_gamma(self, shape, size=None):             # <<<<<<<<<<<<<<
@@ -7904,7 +7897,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oshape = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1501
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1501
  *         cdef double fshape
  * 
  *         fshape = PyFloat_AsDouble(shape)             # <<<<<<<<<<<<<<
@@ -7913,7 +7906,7 @@
  */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1502
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1502
  * 
  *         fshape = PyFloat_AsDouble(shape)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -7923,7 +7916,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1503
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1503
  *         fshape = PyFloat_AsDouble(shape)
  *         if not PyErr_Occurred():
  *             if fshape <= 0:             # <<<<<<<<<<<<<<
@@ -7933,7 +7926,7 @@
     __pyx_t_1 = (__pyx_v_fshape <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1504
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1504
  *         if not PyErr_Occurred():
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -7955,7 +7948,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1505
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1505
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")
  *             return cont1_array_sc(self.internal_state, rk_standard_gamma, size, fshape)             # <<<<<<<<<<<<<<
@@ -7972,7 +7965,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1507
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1507
  *             return cont1_array_sc(self.internal_state, rk_standard_gamma, size, fshape)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -7981,7 +7974,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1508
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1508
  * 
  *         PyErr_Clear()
  *         oshape = <ndarray> PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7995,7 +7988,7 @@
   __pyx_v_oshape = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1509
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1509
  *         PyErr_Clear()
  *         oshape = <ndarray> PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):             # <<<<<<<<<<<<<<
@@ -8039,7 +8032,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1510
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1510
  *         oshape = <ndarray> PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8061,7 +8054,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1511
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1511
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")
  *         return cont1_array(self.internal_state, rk_standard_gamma, size, oshape)             # <<<<<<<<<<<<<<
@@ -8094,7 +8087,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1513
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1513
  *         return cont1_array(self.internal_state, rk_standard_gamma, size, oshape)
  * 
  *     def gamma(self, shape, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -8179,7 +8172,7 @@
   __pyx_v_oshape = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1586
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1586
  *         cdef double fshape, fscale
  * 
  *         fshape = PyFloat_AsDouble(shape)             # <<<<<<<<<<<<<<
@@ -8188,7 +8181,7 @@
  */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1587
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1587
  * 
  *         fshape = PyFloat_AsDouble(shape)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -8197,7 +8190,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1588
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1588
  *         fshape = PyFloat_AsDouble(shape)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -8207,7 +8200,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1589
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1589
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fshape <= 0:             # <<<<<<<<<<<<<<
@@ -8217,7 +8210,7 @@
     __pyx_t_1 = (__pyx_v_fshape <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1590
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1590
  *         if not PyErr_Occurred():
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8239,7 +8232,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1591
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1591
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -8249,7 +8242,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1592
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1592
  *                 raise ValueError("shape <= 0")
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -8271,7 +8264,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1593
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1593
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_gamma, size, fshape, fscale)             # <<<<<<<<<<<<<<
@@ -8288,7 +8281,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1595
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1595
  *             return cont2_array_sc(self.internal_state, rk_gamma, size, fshape, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -8297,7 +8290,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1596
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1596
  * 
  *         PyErr_Clear()
  *         oshape = <ndarray>PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8311,7 +8304,7 @@
   __pyx_v_oshape = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1597
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1597
  *         PyErr_Clear()
  *         oshape = <ndarray>PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8325,7 +8318,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1598
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1598
  *         oshape = <ndarray>PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):             # <<<<<<<<<<<<<<
@@ -8369,7 +8362,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1599
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1599
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8391,7 +8384,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1600
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1600
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -8435,7 +8428,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1601
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1601
  *             raise ValueError("shape <= 0")
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -8457,7 +8450,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1602
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1602
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_gamma, size, oshape, oscale)             # <<<<<<<<<<<<<<
@@ -8492,7 +8485,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1604
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1604
  *         return cont2_array(self.internal_state, rk_gamma, size, oshape, oscale)
  * 
  *     def f(self, dfnum, dfden, size=None):             # <<<<<<<<<<<<<<
@@ -8578,7 +8571,7 @@
   __pyx_v_odfnum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_odfden = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1688
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1688
  *         cdef double fdfnum, fdfden
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)             # <<<<<<<<<<<<<<
@@ -8587,7 +8580,7 @@
  */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1689
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1689
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)             # <<<<<<<<<<<<<<
@@ -8596,7 +8589,7 @@
  */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1690
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1690
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -8606,7 +8599,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1691
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1691
  *         fdfden = PyFloat_AsDouble(dfden)
  *         if not PyErr_Occurred():
  *             if fdfnum <= 0:             # <<<<<<<<<<<<<<
@@ -8616,7 +8609,7 @@
     __pyx_t_1 = (__pyx_v_fdfnum <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1692
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1692
  *         if not PyErr_Occurred():
  *             if fdfnum <= 0:
  *                 raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8638,7 +8631,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1693
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1693
  *             if fdfnum <= 0:
  *                 raise ValueError("shape <= 0")
  *             if fdfden <= 0:             # <<<<<<<<<<<<<<
@@ -8648,7 +8641,7 @@
     __pyx_t_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1694
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1694
  *                 raise ValueError("shape <= 0")
  *             if fdfden <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -8670,7 +8663,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1695
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1695
  *             if fdfden <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_f, size, fdfnum, fdfden)             # <<<<<<<<<<<<<<
@@ -8687,7 +8680,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1697
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1697
  *             return cont2_array_sc(self.internal_state, rk_f, size, fdfnum, fdfden)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -8696,7 +8689,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1699
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1699
  *         PyErr_Clear()
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8710,7 +8703,7 @@
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1700
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1700
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8724,7 +8717,7 @@
   __pyx_v_odfden = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1701
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1701
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odfnum, 0.0)):             # <<<<<<<<<<<<<<
@@ -8768,7 +8761,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1702
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1702
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odfnum, 0.0)):
  *             raise ValueError("dfnum <= 0")             # <<<<<<<<<<<<<<
@@ -8790,7 +8783,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1703
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1703
  *         if np.any(np.less_equal(odfnum, 0.0)):
  *             raise ValueError("dfnum <= 0")
  *         if np.any(np.less_equal(odfden, 0.0)):             # <<<<<<<<<<<<<<
@@ -8834,7 +8827,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1704
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1704
  *             raise ValueError("dfnum <= 0")
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")             # <<<<<<<<<<<<<<
@@ -8856,7 +8849,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1705
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1705
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")
  *         return cont2_array(self.internal_state, rk_f, size, odfnum, odfden)             # <<<<<<<<<<<<<<
@@ -8891,7 +8884,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1707
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1707
  *         return cont2_array(self.internal_state, rk_f, size, odfnum, odfden)
  * 
  *     def noncentral_f(self, dfnum, dfden, nonc, size=None):             # <<<<<<<<<<<<<<
@@ -8991,7 +8984,7 @@
   __pyx_v_odfden = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1774
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1774
  *         cdef double fdfnum, fdfden, fnonc
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)             # <<<<<<<<<<<<<<
@@ -9000,7 +8993,7 @@
  */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1775
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1775
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)             # <<<<<<<<<<<<<<
@@ -9009,7 +9002,7 @@
  */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1776
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1776
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)
  *         fnonc = PyFloat_AsDouble(nonc)             # <<<<<<<<<<<<<<
@@ -9018,7 +9011,7 @@
  */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1777
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1777
  *         fdfden = PyFloat_AsDouble(dfden)
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -9028,7 +9021,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1778
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1778
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():
  *             if fdfnum <= 1:             # <<<<<<<<<<<<<<
@@ -9038,7 +9031,7 @@
     __pyx_t_1 = (__pyx_v_fdfnum <= 1);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1779
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1779
  *         if not PyErr_Occurred():
  *             if fdfnum <= 1:
  *                 raise ValueError("dfnum <= 1")             # <<<<<<<<<<<<<<
@@ -9060,7 +9053,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1780
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1780
  *             if fdfnum <= 1:
  *                 raise ValueError("dfnum <= 1")
  *             if fdfden <= 0:             # <<<<<<<<<<<<<<
@@ -9070,7 +9063,7 @@
     __pyx_t_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1781
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1781
  *                 raise ValueError("dfnum <= 1")
  *             if fdfden <= 0:
  *                 raise ValueError("dfden <= 0")             # <<<<<<<<<<<<<<
@@ -9092,7 +9085,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1782
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1782
  *             if fdfden <= 0:
  *                 raise ValueError("dfden <= 0")
  *             if fnonc < 0:             # <<<<<<<<<<<<<<
@@ -9102,7 +9095,7 @@
     __pyx_t_1 = (__pyx_v_fnonc < 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1783
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1783
  *                 raise ValueError("dfden <= 0")
  *             if fnonc < 0:
  *                 raise ValueError("nonc < 0")             # <<<<<<<<<<<<<<
@@ -9124,7 +9117,7 @@
     }
     __pyx_L9:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1784
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1784
  *             if fnonc < 0:
  *                 raise ValueError("nonc < 0")
  *             return cont3_array_sc(self.internal_state, rk_noncentral_f, size,             # <<<<<<<<<<<<<<
@@ -9133,7 +9126,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1785
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1785
  *                 raise ValueError("nonc < 0")
  *             return cont3_array_sc(self.internal_state, rk_noncentral_f, size,
  *                                   fdfnum, fdfden, fnonc)             # <<<<<<<<<<<<<<
@@ -9149,7 +9142,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1787
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1787
  *                                   fdfnum, fdfden, fnonc)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -9158,7 +9151,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1789
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1789
  *         PyErr_Clear()
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9172,7 +9165,7 @@
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1790
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1790
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9186,7 +9179,7 @@
   __pyx_v_odfden = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1791
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1791
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9200,7 +9193,7 @@
   __pyx_v_ononc = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1793
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1793
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)
  * 
  *         if np.any(np.less_equal(odfnum, 1.0)):             # <<<<<<<<<<<<<<
@@ -9244,7 +9237,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1794
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1794
  * 
  *         if np.any(np.less_equal(odfnum, 1.0)):
  *             raise ValueError("dfnum <= 1")             # <<<<<<<<<<<<<<
@@ -9266,7 +9259,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1795
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1795
  *         if np.any(np.less_equal(odfnum, 1.0)):
  *             raise ValueError("dfnum <= 1")
  *         if np.any(np.less_equal(odfden, 0.0)):             # <<<<<<<<<<<<<<
@@ -9310,7 +9303,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1796
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1796
  *             raise ValueError("dfnum <= 1")
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")             # <<<<<<<<<<<<<<
@@ -9332,7 +9325,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1797
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1797
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")
  *         if np.any(np.less(ononc, 0.0)):             # <<<<<<<<<<<<<<
@@ -9376,7 +9369,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1798
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1798
  *             raise ValueError("dfden <= 0")
  *         if np.any(np.less(ononc, 0.0)):
  *             raise ValueError("nonc < 0")             # <<<<<<<<<<<<<<
@@ -9398,7 +9391,7 @@
   }
   __pyx_L12:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1799
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1799
  *         if np.any(np.less(ononc, 0.0)):
  *             raise ValueError("nonc < 0")
  *         return cont3_array(self.internal_state, rk_noncentral_f, size, odfnum,             # <<<<<<<<<<<<<<
@@ -9407,7 +9400,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1800
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1800
  *             raise ValueError("nonc < 0")
  *         return cont3_array(self.internal_state, rk_noncentral_f, size, odfnum,
  *             odfden, ononc)             # <<<<<<<<<<<<<<
@@ -9443,7 +9436,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1802
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1802
  *             odfden, ononc)
  * 
  *     def chisquare(self, df, size=None):             # <<<<<<<<<<<<<<
@@ -9513,7 +9506,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1869
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1869
  *         cdef double fdf
  * 
  *         fdf = PyFloat_AsDouble(df)             # <<<<<<<<<<<<<<
@@ -9522,7 +9515,7 @@
  */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1870
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1870
  * 
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -9532,7 +9525,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1871
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1871
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():
  *             if fdf <= 0:             # <<<<<<<<<<<<<<
@@ -9542,7 +9535,7 @@
     __pyx_t_1 = (__pyx_v_fdf <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1872
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1872
  *         if not PyErr_Occurred():
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -9564,7 +9557,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1873
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1873
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")
  *             return cont1_array_sc(self.internal_state, rk_chisquare, size, fdf)             # <<<<<<<<<<<<<<
@@ -9581,7 +9574,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1875
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1875
  *             return cont1_array_sc(self.internal_state, rk_chisquare, size, fdf)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -9590,7 +9583,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1877
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1877
  *         PyErr_Clear()
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9604,7 +9597,7 @@
   __pyx_v_odf = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1878
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1878
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):             # <<<<<<<<<<<<<<
@@ -9648,7 +9641,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1879
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1879
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -9670,7 +9663,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1880
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1880
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")
  *         return cont1_array(self.internal_state, rk_chisquare, size, odf)             # <<<<<<<<<<<<<<
@@ -9703,7 +9696,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1882
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1882
  *         return cont1_array(self.internal_state, rk_chisquare, size, odf)
  * 
  *     def noncentral_chisquare(self, df, nonc, size=None):             # <<<<<<<<<<<<<<
@@ -9789,7 +9782,7 @@
   __pyx_v_odf = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1953
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1953
  *         cdef ndarray odf, ononc
  *         cdef double fdf, fnonc
  *         fdf = PyFloat_AsDouble(df)             # <<<<<<<<<<<<<<
@@ -9798,7 +9791,7 @@
  */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1954
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1954
  *         cdef double fdf, fnonc
  *         fdf = PyFloat_AsDouble(df)
  *         fnonc = PyFloat_AsDouble(nonc)             # <<<<<<<<<<<<<<
@@ -9807,7 +9800,7 @@
  */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1955
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1955
  *         fdf = PyFloat_AsDouble(df)
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -9817,7 +9810,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1956
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1956
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():
  *             if fdf <= 1:             # <<<<<<<<<<<<<<
@@ -9827,7 +9820,7 @@
     __pyx_t_1 = (__pyx_v_fdf <= 1);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1957
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1957
  *         if not PyErr_Occurred():
  *             if fdf <= 1:
  *                 raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -9849,7 +9842,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1958
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1958
  *             if fdf <= 1:
  *                 raise ValueError("df <= 0")
  *             if fnonc <= 0:             # <<<<<<<<<<<<<<
@@ -9859,7 +9852,7 @@
     __pyx_t_1 = (__pyx_v_fnonc <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1959
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1959
  *                 raise ValueError("df <= 0")
  *             if fnonc <= 0:
  *                 raise ValueError("nonc <= 0")             # <<<<<<<<<<<<<<
@@ -9881,7 +9874,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1960
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1960
  *             if fnonc <= 0:
  *                 raise ValueError("nonc <= 0")
  *             return cont2_array_sc(self.internal_state, rk_noncentral_chisquare,             # <<<<<<<<<<<<<<
@@ -9890,7 +9883,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1961
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1961
  *                 raise ValueError("nonc <= 0")
  *             return cont2_array_sc(self.internal_state, rk_noncentral_chisquare,
  *                                   size, fdf, fnonc)             # <<<<<<<<<<<<<<
@@ -9906,7 +9899,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1963
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1963
  *                                   size, fdf, fnonc)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -9915,7 +9908,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1965
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1965
  *         PyErr_Clear()
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9929,7 +9922,7 @@
   __pyx_v_odf = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1966
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1966
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9943,7 +9936,7 @@
   __pyx_v_ononc = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1967
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1967
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):             # <<<<<<<<<<<<<<
@@ -9987,7 +9980,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1968
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1968
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 1")             # <<<<<<<<<<<<<<
@@ -10009,7 +10002,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1969
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1969
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 1")
  *         if np.any(np.less_equal(ononc, 0.0)):             # <<<<<<<<<<<<<<
@@ -10053,7 +10046,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1970
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1970
  *             raise ValueError("df <= 1")
  *         if np.any(np.less_equal(ononc, 0.0)):
  *             raise ValueError("nonc < 0")             # <<<<<<<<<<<<<<
@@ -10075,7 +10068,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1971
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1971
  *         if np.any(np.less_equal(ononc, 0.0)):
  *             raise ValueError("nonc < 0")
  *         return cont2_array(self.internal_state, rk_noncentral_chisquare, size,             # <<<<<<<<<<<<<<
@@ -10084,7 +10077,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1972
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1972
  *             raise ValueError("nonc < 0")
  *         return cont2_array(self.internal_state, rk_noncentral_chisquare, size,
  *             odf, ononc)             # <<<<<<<<<<<<<<
@@ -10118,7 +10111,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1974
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1974
  *             odf, ononc)
  * 
  *     def standard_cauchy(self, size=None):             # <<<<<<<<<<<<<<
@@ -10170,7 +10163,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2033
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2033
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_standard_cauchy, size)             # <<<<<<<<<<<<<<
@@ -10196,7 +10189,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2035
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2035
  *         return cont0_array(self.internal_state, rk_standard_cauchy, size)
  * 
  *     def standard_t(self, df, size=None):             # <<<<<<<<<<<<<<
@@ -10266,7 +10259,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2123
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2123
  *         cdef double fdf
  * 
  *         fdf = PyFloat_AsDouble(df)             # <<<<<<<<<<<<<<
@@ -10275,7 +10268,7 @@
  */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2124
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2124
  * 
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -10285,7 +10278,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2125
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2125
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():
  *             if fdf <= 0:             # <<<<<<<<<<<<<<
@@ -10295,7 +10288,7 @@
     __pyx_t_1 = (__pyx_v_fdf <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2126
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2126
  *         if not PyErr_Occurred():
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -10317,7 +10310,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2127
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2127
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")
  *             return cont1_array_sc(self.internal_state, rk_standard_t, size, fdf)             # <<<<<<<<<<<<<<
@@ -10334,7 +10327,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2129
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2129
  *             return cont1_array_sc(self.internal_state, rk_standard_t, size, fdf)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -10343,7 +10336,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2131
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2131
  *         PyErr_Clear()
  * 
  *         odf = <ndarray> PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10357,7 +10350,7 @@
   __pyx_v_odf = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2132
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2132
  * 
  *         odf = <ndarray> PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):             # <<<<<<<<<<<<<<
@@ -10401,7 +10394,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2133
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2133
  *         odf = <ndarray> PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -10423,7 +10416,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2134
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2134
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")
  *         return cont1_array(self.internal_state, rk_standard_t, size, odf)             # <<<<<<<<<<<<<<
@@ -10456,7 +10449,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2136
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2136
  *         return cont1_array(self.internal_state, rk_standard_t, size, odf)
  * 
  *     def vonmises(self, mu, kappa, size=None):             # <<<<<<<<<<<<<<
@@ -10542,7 +10535,7 @@
   __pyx_v_omu = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_okappa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2216
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2216
  *         cdef double fmu, fkappa
  * 
  *         fmu = PyFloat_AsDouble(mu)             # <<<<<<<<<<<<<<
@@ -10551,7 +10544,7 @@
  */
   __pyx_v_fmu = PyFloat_AsDouble(__pyx_v_mu);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2217
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2217
  * 
  *         fmu = PyFloat_AsDouble(mu)
  *         fkappa = PyFloat_AsDouble(kappa)             # <<<<<<<<<<<<<<
@@ -10560,7 +10553,7 @@
  */
   __pyx_v_fkappa = PyFloat_AsDouble(__pyx_v_kappa);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2218
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2218
  *         fmu = PyFloat_AsDouble(mu)
  *         fkappa = PyFloat_AsDouble(kappa)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -10570,7 +10563,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2219
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2219
  *         fkappa = PyFloat_AsDouble(kappa)
  *         if not PyErr_Occurred():
  *             if fkappa < 0:             # <<<<<<<<<<<<<<
@@ -10580,7 +10573,7 @@
     __pyx_t_1 = (__pyx_v_fkappa < 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2220
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2220
  *         if not PyErr_Occurred():
  *             if fkappa < 0:
  *                 raise ValueError("kappa < 0")             # <<<<<<<<<<<<<<
@@ -10602,7 +10595,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2221
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2221
  *             if fkappa < 0:
  *                 raise ValueError("kappa < 0")
  *             return cont2_array_sc(self.internal_state, rk_vonmises, size, fmu, fkappa)             # <<<<<<<<<<<<<<
@@ -10619,7 +10612,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2223
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2223
  *             return cont2_array_sc(self.internal_state, rk_vonmises, size, fmu, fkappa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -10628,7 +10621,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2225
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2225
  *         PyErr_Clear()
  * 
  *         omu = <ndarray> PyArray_FROM_OTF(mu, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10642,7 +10635,7 @@
   __pyx_v_omu = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2226
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2226
  * 
  *         omu = <ndarray> PyArray_FROM_OTF(mu, NPY_DOUBLE, NPY_ALIGNED)
  *         okappa = <ndarray> PyArray_FROM_OTF(kappa, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10656,7 +10649,7 @@
   __pyx_v_okappa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2227
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2227
  *         omu = <ndarray> PyArray_FROM_OTF(mu, NPY_DOUBLE, NPY_ALIGNED)
  *         okappa = <ndarray> PyArray_FROM_OTF(kappa, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(okappa, 0.0)):             # <<<<<<<<<<<<<<
@@ -10700,7 +10693,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2228
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2228
  *         okappa = <ndarray> PyArray_FROM_OTF(kappa, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(okappa, 0.0)):
  *             raise ValueError("kappa < 0")             # <<<<<<<<<<<<<<
@@ -10722,7 +10715,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2229
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2229
  *         if np.any(np.less(okappa, 0.0)):
  *             raise ValueError("kappa < 0")
  *         return cont2_array(self.internal_state, rk_vonmises, size, omu, okappa)             # <<<<<<<<<<<<<<
@@ -10757,7 +10750,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2231
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2231
  *         return cont2_array(self.internal_state, rk_vonmises, size, omu, okappa)
  * 
  *     def pareto(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -10827,7 +10820,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2307
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2307
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -10836,7 +10829,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2308
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2308
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -10846,7 +10839,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2309
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2309
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -10856,7 +10849,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2310
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2310
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -10878,7 +10871,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2311
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2311
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             return cont1_array_sc(self.internal_state, rk_pareto, size, fa)             # <<<<<<<<<<<<<<
@@ -10895,7 +10888,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2313
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2313
  *             return cont1_array_sc(self.internal_state, rk_pareto, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -10904,7 +10897,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2315
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2315
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10918,7 +10911,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2316
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2316
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):             # <<<<<<<<<<<<<<
@@ -10962,7 +10955,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2317
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2317
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -10984,7 +10977,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2318
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2318
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")
  *         return cont1_array(self.internal_state, rk_pareto, size, oa)             # <<<<<<<<<<<<<<
@@ -11017,7 +11010,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2320
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2320
  *         return cont1_array(self.internal_state, rk_pareto, size, oa)
  * 
  *     def weibull(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -11087,7 +11080,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2407
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2407
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -11096,7 +11089,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2408
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2408
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11106,7 +11099,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2409
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2409
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -11116,7 +11109,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2410
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2410
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11138,7 +11131,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2411
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2411
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             return cont1_array_sc(self.internal_state, rk_weibull, size, fa)             # <<<<<<<<<<<<<<
@@ -11155,7 +11148,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2413
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2413
  *             return cont1_array_sc(self.internal_state, rk_weibull, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -11164,7 +11157,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2415
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2415
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11178,7 +11171,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2416
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2416
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):             # <<<<<<<<<<<<<<
@@ -11222,7 +11215,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2417
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2417
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11244,7 +11237,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2418
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2418
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")
  *         return cont1_array(self.internal_state, rk_weibull, size, oa)             # <<<<<<<<<<<<<<
@@ -11277,7 +11270,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2420
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2420
  *         return cont1_array(self.internal_state, rk_weibull, size, oa)
  * 
  *     def power(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -11347,7 +11340,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2516
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2516
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -11356,7 +11349,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2517
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2517
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11366,7 +11359,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2518
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2518
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -11376,7 +11369,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2519
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2519
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11398,7 +11391,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2520
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2520
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             return cont1_array_sc(self.internal_state, rk_power, size, fa)             # <<<<<<<<<<<<<<
@@ -11415,7 +11408,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2522
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2522
  *             return cont1_array_sc(self.internal_state, rk_power, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -11424,7 +11417,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2524
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2524
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11438,7 +11431,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2525
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2525
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):             # <<<<<<<<<<<<<<
@@ -11482,7 +11475,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2526
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2526
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11504,7 +11497,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2527
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2527
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")
  *         return cont1_array(self.internal_state, rk_power, size, oa)             # <<<<<<<<<<<<<<
@@ -11537,7 +11530,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2529
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2529
  *         return cont1_array(self.internal_state, rk_power, size, oa)
  * 
  *     def laplace(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -11625,7 +11618,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2605
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2605
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -11634,7 +11627,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2606
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2606
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -11643,7 +11636,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2607
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2607
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11653,7 +11646,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2608
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2608
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -11663,7 +11656,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2609
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2609
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -11685,7 +11678,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2610
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2610
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_laplace, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -11702,7 +11695,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2612
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2612
  *             return cont2_array_sc(self.internal_state, rk_laplace, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -11711,7 +11704,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2613
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2613
  * 
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11725,7 +11718,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2614
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2614
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11739,7 +11732,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2615
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2615
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -11783,7 +11776,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2616
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2616
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -11805,7 +11798,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2617
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2617
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_laplace, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -11840,7 +11833,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2619
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2619
  *         return cont2_array(self.internal_state, rk_laplace, size, oloc, oscale)
  * 
  *     def gumbel(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -11928,7 +11921,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2729
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2729
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -11937,7 +11930,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2730
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2730
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -11946,7 +11939,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2731
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2731
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11956,7 +11949,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2732
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2732
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -11966,7 +11959,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2733
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2733
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -11988,7 +11981,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2734
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2734
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_gumbel, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -12005,7 +11998,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2736
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2736
  *             return cont2_array_sc(self.internal_state, rk_gumbel, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12014,7 +12007,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2737
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2737
  * 
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12028,7 +12021,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2738
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2738
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12042,7 +12035,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2739
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2739
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -12086,7 +12079,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2740
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2740
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12108,7 +12101,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2741
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2741
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_gumbel, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -12143,7 +12136,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2743
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2743
  *         return cont2_array(self.internal_state, rk_gumbel, size, oloc, oscale)
  * 
  *     def logistic(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -12231,7 +12224,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2817
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2817
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -12240,7 +12233,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2818
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2818
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -12249,7 +12242,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2819
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2819
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -12259,7 +12252,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2820
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2820
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -12269,7 +12262,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2821
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2821
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12291,7 +12284,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2822
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2822
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_logistic, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -12308,7 +12301,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2824
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2824
  *             return cont2_array_sc(self.internal_state, rk_logistic, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12317,7 +12310,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2825
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2825
  * 
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12331,7 +12324,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2826
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2826
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12345,7 +12338,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2827
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2827
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -12389,7 +12382,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2828
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2828
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12411,7 +12404,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2829
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2829
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_logistic, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -12446,7 +12439,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2831
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2831
  *         return cont2_array(self.internal_state, rk_logistic, size, oloc, oscale)
  * 
  *     def lognormal(self, mean=0.0, sigma=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -12534,7 +12527,7 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_osigma = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2946
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2946
  *         cdef double fmean, fsigma
  * 
  *         fmean = PyFloat_AsDouble(mean)             # <<<<<<<<<<<<<<
@@ -12543,7 +12536,7 @@
  */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2947
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2947
  * 
  *         fmean = PyFloat_AsDouble(mean)
  *         fsigma = PyFloat_AsDouble(sigma)             # <<<<<<<<<<<<<<
@@ -12552,7 +12545,7 @@
  */
   __pyx_v_fsigma = PyFloat_AsDouble(__pyx_v_sigma);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2949
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2949
  *         fsigma = PyFloat_AsDouble(sigma)
  * 
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -12562,7 +12555,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2950
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2950
  * 
  *         if not PyErr_Occurred():
  *             if fsigma <= 0:             # <<<<<<<<<<<<<<
@@ -12572,7 +12565,7 @@
     __pyx_t_1 = (__pyx_v_fsigma <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2951
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2951
  *         if not PyErr_Occurred():
  *             if fsigma <= 0:
  *                 raise ValueError("sigma <= 0")             # <<<<<<<<<<<<<<
@@ -12594,7 +12587,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2952
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2952
  *             if fsigma <= 0:
  *                 raise ValueError("sigma <= 0")
  *             return cont2_array_sc(self.internal_state, rk_lognormal, size, fmean, fsigma)             # <<<<<<<<<<<<<<
@@ -12611,7 +12604,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2954
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2954
  *             return cont2_array_sc(self.internal_state, rk_lognormal, size, fmean, fsigma)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12620,7 +12613,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2956
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2956
  *         PyErr_Clear()
  * 
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12634,7 +12627,7 @@
   __pyx_v_omean = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2957
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2957
  * 
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         osigma = PyArray_FROM_OTF(sigma, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12648,7 +12641,7 @@
   __pyx_v_osigma = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2958
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2958
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         osigma = PyArray_FROM_OTF(sigma, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(osigma, 0.0)):             # <<<<<<<<<<<<<<
@@ -12692,7 +12685,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2959
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2959
  *         osigma = PyArray_FROM_OTF(sigma, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(osigma, 0.0)):
  *             raise ValueError("sigma <= 0.0")             # <<<<<<<<<<<<<<
@@ -12714,7 +12707,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2960
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2960
  *         if np.any(np.less_equal(osigma, 0.0)):
  *             raise ValueError("sigma <= 0.0")
  *         return cont2_array(self.internal_state, rk_lognormal, size, omean, osigma)             # <<<<<<<<<<<<<<
@@ -12749,7 +12742,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2962
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2962
  *         return cont2_array(self.internal_state, rk_lognormal, size, omean, osigma)
  * 
  *     def rayleigh(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -12822,7 +12815,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3020
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3020
  *         cdef double fscale
  * 
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -12831,7 +12824,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3022
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3022
  *         fscale = PyFloat_AsDouble(scale)
  * 
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -12841,7 +12834,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3023
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3023
  * 
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -12851,7 +12844,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3024
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3024
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12873,7 +12866,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3025
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3025
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont1_array_sc(self.internal_state, rk_rayleigh, size, fscale)             # <<<<<<<<<<<<<<
@@ -12890,7 +12883,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3027
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3027
  *             return cont1_array_sc(self.internal_state, rk_rayleigh, size, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12899,7 +12892,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3029
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3029
  *         PyErr_Clear()
  * 
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12913,7 +12906,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3030
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3030
  * 
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -12957,7 +12950,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3031
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3031
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0.0")             # <<<<<<<<<<<<<<
@@ -12979,7 +12972,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3032
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3032
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0.0")
  *         return cont1_array(self.internal_state, rk_rayleigh, size, oscale)             # <<<<<<<<<<<<<<
@@ -13012,7 +13005,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3034
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3034
  *         return cont1_array(self.internal_state, rk_rayleigh, size, oscale)
  * 
  *     def wald(self, mean, scale, size=None):             # <<<<<<<<<<<<<<
@@ -13098,7 +13091,7 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3100
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3100
  *         cdef double fmean, fscale
  * 
  *         fmean = PyFloat_AsDouble(mean)             # <<<<<<<<<<<<<<
@@ -13107,7 +13100,7 @@
  */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3101
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3101
  * 
  *         fmean = PyFloat_AsDouble(mean)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -13116,7 +13109,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3102
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3102
  *         fmean = PyFloat_AsDouble(mean)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -13126,7 +13119,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3103
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3103
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fmean <= 0:             # <<<<<<<<<<<<<<
@@ -13136,7 +13129,7 @@
     __pyx_t_1 = (__pyx_v_fmean <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3104
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3104
  *         if not PyErr_Occurred():
  *             if fmean <= 0:
  *                 raise ValueError("mean <= 0")             # <<<<<<<<<<<<<<
@@ -13158,7 +13151,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3105
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3105
  *             if fmean <= 0:
  *                 raise ValueError("mean <= 0")
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -13168,7 +13161,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3106
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3106
  *                 raise ValueError("mean <= 0")
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -13190,7 +13183,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3107
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3107
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_wald, size, fmean, fscale)             # <<<<<<<<<<<<<<
@@ -13207,7 +13200,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3109
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3109
  *             return cont2_array_sc(self.internal_state, rk_wald, size, fmean, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -13216,7 +13209,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3110
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3110
  * 
  *         PyErr_Clear()
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13230,7 +13223,7 @@
   __pyx_v_omean = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3111
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3111
  *         PyErr_Clear()
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13244,7 +13237,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3112
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3112
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(omean,0.0)):             # <<<<<<<<<<<<<<
@@ -13288,7 +13281,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3113
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3113
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(omean,0.0)):
  *             raise ValueError("mean <= 0.0")             # <<<<<<<<<<<<<<
@@ -13309,7 +13302,7 @@
     goto __pyx_L9;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3114
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3114
  *         if np.any(np.less_equal(omean,0.0)):
  *             raise ValueError("mean <= 0.0")
  *         elif np.any(np.less_equal(oscale,0.0)):             # <<<<<<<<<<<<<<
@@ -13353,7 +13346,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3115
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3115
  *             raise ValueError("mean <= 0.0")
  *         elif np.any(np.less_equal(oscale,0.0)):
  *             raise ValueError("scale <= 0.0")             # <<<<<<<<<<<<<<
@@ -13375,7 +13368,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3116
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3116
  *         elif np.any(np.less_equal(oscale,0.0)):
  *             raise ValueError("scale <= 0.0")
  *         return cont2_array(self.internal_state, rk_wald, size, omean, oscale)             # <<<<<<<<<<<<<<
@@ -13410,7 +13403,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3120
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3120
  * 
  * 
  *     def triangular(self, left, mode, right, size=None):             # <<<<<<<<<<<<<<
@@ -13510,7 +13503,7 @@
   __pyx_v_omode = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oright = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3180
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3180
  *         cdef double fleft, fmode, fright
  * 
  *         fleft = PyFloat_AsDouble(left)             # <<<<<<<<<<<<<<
@@ -13519,7 +13512,7 @@
  */
   __pyx_v_fleft = PyFloat_AsDouble(__pyx_v_left);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3181
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3181
  * 
  *         fleft = PyFloat_AsDouble(left)
  *         fright = PyFloat_AsDouble(right)             # <<<<<<<<<<<<<<
@@ -13528,7 +13521,7 @@
  */
   __pyx_v_fright = PyFloat_AsDouble(__pyx_v_right);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3182
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3182
  *         fleft = PyFloat_AsDouble(left)
  *         fright = PyFloat_AsDouble(right)
  *         fmode = PyFloat_AsDouble(mode)             # <<<<<<<<<<<<<<
@@ -13537,7 +13530,7 @@
  */
   __pyx_v_fmode = PyFloat_AsDouble(__pyx_v_mode);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3183
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3183
  *         fright = PyFloat_AsDouble(right)
  *         fmode = PyFloat_AsDouble(mode)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -13547,7 +13540,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3184
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3184
  *         fmode = PyFloat_AsDouble(mode)
  *         if not PyErr_Occurred():
  *             if fleft > fmode:             # <<<<<<<<<<<<<<
@@ -13557,7 +13550,7 @@
     __pyx_t_1 = (__pyx_v_fleft > __pyx_v_fmode);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3185
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3185
  *         if not PyErr_Occurred():
  *             if fleft > fmode:
  *                 raise ValueError("left > mode")             # <<<<<<<<<<<<<<
@@ -13579,7 +13572,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3186
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3186
  *             if fleft > fmode:
  *                 raise ValueError("left > mode")
  *             if fmode > fright:             # <<<<<<<<<<<<<<
@@ -13589,7 +13582,7 @@
     __pyx_t_1 = (__pyx_v_fmode > __pyx_v_fright);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3187
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3187
  *                 raise ValueError("left > mode")
  *             if fmode > fright:
  *                 raise ValueError("mode > right")             # <<<<<<<<<<<<<<
@@ -13611,7 +13604,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3188
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3188
  *             if fmode > fright:
  *                 raise ValueError("mode > right")
  *             if fleft == fright:             # <<<<<<<<<<<<<<
@@ -13621,7 +13614,7 @@
     __pyx_t_1 = (__pyx_v_fleft == __pyx_v_fright);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3189
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3189
  *                 raise ValueError("mode > right")
  *             if fleft == fright:
  *                 raise ValueError("left == right")             # <<<<<<<<<<<<<<
@@ -13643,7 +13636,7 @@
     }
     __pyx_L9:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3190
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3190
  *             if fleft == fright:
  *                 raise ValueError("left == right")
  *             return cont3_array_sc(self.internal_state, rk_triangular, size, fleft,             # <<<<<<<<<<<<<<
@@ -13652,7 +13645,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3191
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3191
  *                 raise ValueError("left == right")
  *             return cont3_array_sc(self.internal_state, rk_triangular, size, fleft,
  *                                   fmode, fright)             # <<<<<<<<<<<<<<
@@ -13668,7 +13661,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3193
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3193
  *                                   fmode, fright)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -13677,7 +13670,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3194
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3194
  * 
  *         PyErr_Clear()
  *         oleft = <ndarray>PyArray_FROM_OTF(left, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13691,7 +13684,7 @@
   __pyx_v_oleft = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3195
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3195
  *         PyErr_Clear()
  *         oleft = <ndarray>PyArray_FROM_OTF(left, NPY_DOUBLE, NPY_ALIGNED)
  *         omode = <ndarray>PyArray_FROM_OTF(mode, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13705,7 +13698,7 @@
   __pyx_v_omode = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3196
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3196
  *         oleft = <ndarray>PyArray_FROM_OTF(left, NPY_DOUBLE, NPY_ALIGNED)
  *         omode = <ndarray>PyArray_FROM_OTF(mode, NPY_DOUBLE, NPY_ALIGNED)
  *         oright = <ndarray>PyArray_FROM_OTF(right, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13719,7 +13712,7 @@
   __pyx_v_oright = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3198
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3198
  *         oright = <ndarray>PyArray_FROM_OTF(right, NPY_DOUBLE, NPY_ALIGNED)
  * 
  *         if np.any(np.greater(oleft, omode)):             # <<<<<<<<<<<<<<
@@ -13761,7 +13754,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3199
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3199
  * 
  *         if np.any(np.greater(oleft, omode)):
  *             raise ValueError("left > mode")             # <<<<<<<<<<<<<<
@@ -13783,7 +13776,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3200
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3200
  *         if np.any(np.greater(oleft, omode)):
  *             raise ValueError("left > mode")
  *         if np.any(np.greater(omode, oright)):             # <<<<<<<<<<<<<<
@@ -13825,7 +13818,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3201
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3201
  *             raise ValueError("left > mode")
  *         if np.any(np.greater(omode, oright)):
  *             raise ValueError("mode > right")             # <<<<<<<<<<<<<<
@@ -13847,7 +13840,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3202
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3202
  *         if np.any(np.greater(omode, oright)):
  *             raise ValueError("mode > right")
  *         if np.any(np.equal(oleft, oright)):             # <<<<<<<<<<<<<<
@@ -13889,7 +13882,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3203
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3203
  *             raise ValueError("mode > right")
  *         if np.any(np.equal(oleft, oright)):
  *             raise ValueError("left == right")             # <<<<<<<<<<<<<<
@@ -13911,7 +13904,7 @@
   }
   __pyx_L12:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3204
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3204
  *         if np.any(np.equal(oleft, oright)):
  *             raise ValueError("left == right")
  *         return cont3_array(self.internal_state, rk_triangular, size, oleft,             # <<<<<<<<<<<<<<
@@ -13920,7 +13913,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3205
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3205
  *             raise ValueError("left == right")
  *         return cont3_array(self.internal_state, rk_triangular, size, oleft,
  *             omode, oright)             # <<<<<<<<<<<<<<
@@ -13956,7 +13949,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3208
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3208
  * 
  *     # Complicated, discrete distributions:
  *     def binomial(self, n, p, size=None):             # <<<<<<<<<<<<<<
@@ -14042,7 +14035,7 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3293
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3293
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -14051,7 +14044,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3294
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3294
  * 
  *         fp = PyFloat_AsDouble(p)
  *         ln = PyInt_AsLong(n)             # <<<<<<<<<<<<<<
@@ -14060,7 +14053,7 @@
  */
   __pyx_v_ln = PyInt_AsLong(__pyx_v_n);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3295
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3295
  *         fp = PyFloat_AsDouble(p)
  *         ln = PyInt_AsLong(n)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -14070,7 +14063,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3296
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3296
  *         ln = PyInt_AsLong(n)
  *         if not PyErr_Occurred():
  *             if ln <= 0:             # <<<<<<<<<<<<<<
@@ -14080,7 +14073,7 @@
     __pyx_t_1 = (__pyx_v_ln <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3297
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3297
  *         if not PyErr_Occurred():
  *             if ln <= 0:
  *                 raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14102,7 +14095,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3298
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3298
  *             if ln <= 0:
  *                 raise ValueError("n <= 0")
  *             if fp < 0:             # <<<<<<<<<<<<<<
@@ -14112,7 +14105,7 @@
     __pyx_t_1 = (__pyx_v_fp < 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3299
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3299
  *                 raise ValueError("n <= 0")
  *             if fp < 0:
  *                 raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14133,7 +14126,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3300
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3300
  *             if fp < 0:
  *                 raise ValueError("p < 0")
  *             elif fp > 1:             # <<<<<<<<<<<<<<
@@ -14143,7 +14136,7 @@
     __pyx_t_1 = (__pyx_v_fp > 1);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3301
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3301
  *                 raise ValueError("p < 0")
  *             elif fp > 1:
  *                 raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14165,7 +14158,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3302
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3302
  *             elif fp > 1:
  *                 raise ValueError("p > 1")
  *             return discnp_array_sc(self.internal_state, rk_binomial, size, ln, fp)             # <<<<<<<<<<<<<<
@@ -14182,7 +14175,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3304
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3304
  *             return discnp_array_sc(self.internal_state, rk_binomial, size, ln, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -14191,7 +14184,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3306
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3306
  *         PyErr_Clear()
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14205,7 +14198,7 @@
   __pyx_v_on = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3307
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3307
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_LONG, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14219,7 +14212,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3308
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3308
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_LONG, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):             # <<<<<<<<<<<<<<
@@ -14261,7 +14254,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3309
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3309
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14283,7 +14276,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3310
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3310
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):             # <<<<<<<<<<<<<<
@@ -14325,7 +14318,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3311
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3311
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14347,7 +14340,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3312
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3312
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):             # <<<<<<<<<<<<<<
@@ -14389,7 +14382,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3313
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3313
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14411,7 +14404,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3314
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3314
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")
  *         return discnp_array(self.internal_state, rk_binomial, size, on, op)             # <<<<<<<<<<<<<<
@@ -14446,7 +14439,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3316
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3316
  *         return discnp_array(self.internal_state, rk_binomial, size, on, op)
  * 
  *     def negative_binomial(self, n, p, size=None):             # <<<<<<<<<<<<<<
@@ -14532,7 +14525,7 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3386
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3386
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -14541,7 +14534,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3387
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3387
  * 
  *         fp = PyFloat_AsDouble(p)
  *         fn = PyFloat_AsDouble(n)             # <<<<<<<<<<<<<<
@@ -14550,7 +14543,7 @@
  */
   __pyx_v_fn = PyFloat_AsDouble(__pyx_v_n);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3388
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3388
  *         fp = PyFloat_AsDouble(p)
  *         fn = PyFloat_AsDouble(n)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -14560,7 +14553,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3389
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3389
  *         fn = PyFloat_AsDouble(n)
  *         if not PyErr_Occurred():
  *             if fn <= 0:             # <<<<<<<<<<<<<<
@@ -14570,7 +14563,7 @@
     __pyx_t_1 = (__pyx_v_fn <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3390
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3390
  *         if not PyErr_Occurred():
  *             if fn <= 0:
  *                 raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14592,7 +14585,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3391
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3391
  *             if fn <= 0:
  *                 raise ValueError("n <= 0")
  *             if fp < 0:             # <<<<<<<<<<<<<<
@@ -14602,7 +14595,7 @@
     __pyx_t_1 = (__pyx_v_fp < 0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3392
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3392
  *                 raise ValueError("n <= 0")
  *             if fp < 0:
  *                 raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14623,7 +14616,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3393
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3393
  *             if fp < 0:
  *                 raise ValueError("p < 0")
  *             elif fp > 1:             # <<<<<<<<<<<<<<
@@ -14633,7 +14626,7 @@
     __pyx_t_1 = (__pyx_v_fp > 1);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3394
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3394
  *                 raise ValueError("p < 0")
  *             elif fp > 1:
  *                 raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14655,7 +14648,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3395
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3395
  *             elif fp > 1:
  *                 raise ValueError("p > 1")
  *             return discdd_array_sc(self.internal_state, rk_negative_binomial,             # <<<<<<<<<<<<<<
@@ -14664,7 +14657,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3396
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3396
  *                 raise ValueError("p > 1")
  *             return discdd_array_sc(self.internal_state, rk_negative_binomial,
  *                                    size, fn, fp)             # <<<<<<<<<<<<<<
@@ -14680,7 +14673,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3398
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3398
  *                                    size, fn, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -14689,7 +14682,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3400
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3400
  *         PyErr_Clear()
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14703,7 +14696,7 @@
   __pyx_v_on = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3401
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3401
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_DOUBLE, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14717,7 +14710,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3402
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3402
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_DOUBLE, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):             # <<<<<<<<<<<<<<
@@ -14759,7 +14752,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3403
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3403
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14781,7 +14774,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3404
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3404
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):             # <<<<<<<<<<<<<<
@@ -14823,7 +14816,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3405
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3405
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14845,7 +14838,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3406
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3406
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):             # <<<<<<<<<<<<<<
@@ -14887,7 +14880,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3407
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3407
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14909,7 +14902,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3408
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3408
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")
  *         return discdd_array(self.internal_state, rk_negative_binomial, size,             # <<<<<<<<<<<<<<
@@ -14918,7 +14911,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3409
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3409
  *             raise ValueError("p > 1")
  *         return discdd_array(self.internal_state, rk_negative_binomial, size,
  *                             on, op)             # <<<<<<<<<<<<<<
@@ -14952,7 +14945,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3411
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3411
  *                             on, op)
  * 
  *     def poisson(self, lam=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -15025,7 +15018,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_olam = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3461
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3461
  *         cdef ndarray olam
  *         cdef double flam
  *         flam = PyFloat_AsDouble(lam)             # <<<<<<<<<<<<<<
@@ -15034,7 +15027,7 @@
  */
   __pyx_v_flam = PyFloat_AsDouble(__pyx_v_lam);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3462
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3462
  *         cdef double flam
  *         flam = PyFloat_AsDouble(lam)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15044,7 +15037,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3463
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3463
  *         flam = PyFloat_AsDouble(lam)
  *         if not PyErr_Occurred():
  *             if lam < 0:             # <<<<<<<<<<<<<<
@@ -15057,7 +15050,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3464
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3464
  *         if not PyErr_Occurred():
  *             if lam < 0:
  *                 raise ValueError("lam < 0")             # <<<<<<<<<<<<<<
@@ -15079,7 +15072,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3465
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3465
  *             if lam < 0:
  *                 raise ValueError("lam < 0")
  *             return discd_array_sc(self.internal_state, rk_poisson, size, flam)             # <<<<<<<<<<<<<<
@@ -15096,7 +15089,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3467
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3467
  *             return discd_array_sc(self.internal_state, rk_poisson, size, flam)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -15105,7 +15098,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3469
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3469
  *         PyErr_Clear()
  * 
  *         olam = <ndarray>PyArray_FROM_OTF(lam, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -15119,7 +15112,7 @@
   __pyx_v_olam = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3470
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3470
  * 
  *         olam = <ndarray>PyArray_FROM_OTF(lam, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(olam, 0)):             # <<<<<<<<<<<<<<
@@ -15161,7 +15154,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3471
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3471
  *         olam = <ndarray>PyArray_FROM_OTF(lam, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(olam, 0)):
  *             raise ValueError("lam < 0")             # <<<<<<<<<<<<<<
@@ -15183,7 +15176,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3472
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3472
  *         if np.any(np.less(olam, 0)):
  *             raise ValueError("lam < 0")
  *         return discd_array(self.internal_state, rk_poisson, size, olam)             # <<<<<<<<<<<<<<
@@ -15216,7 +15209,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3474
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3474
  *         return discd_array(self.internal_state, rk_poisson, size, olam)
  * 
  *     def zipf(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -15286,7 +15279,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3553
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3553
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -15295,7 +15288,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3554
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3554
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15305,7 +15298,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3555
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3555
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 1.0:             # <<<<<<<<<<<<<<
@@ -15315,7 +15308,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 1.0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3556
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3556
  *         if not PyErr_Occurred():
  *             if fa <= 1.0:
  *                 raise ValueError("a <= 1.0")             # <<<<<<<<<<<<<<
@@ -15337,7 +15330,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3557
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3557
  *             if fa <= 1.0:
  *                 raise ValueError("a <= 1.0")
  *             return discd_array_sc(self.internal_state, rk_zipf, size, fa)             # <<<<<<<<<<<<<<
@@ -15354,7 +15347,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3559
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3559
  *             return discd_array_sc(self.internal_state, rk_zipf, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -15363,7 +15356,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3561
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3561
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -15377,7 +15370,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3562
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3562
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 1.0)):             # <<<<<<<<<<<<<<
@@ -15421,7 +15414,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3563
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3563
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 1.0)):
  *             raise ValueError("a <= 1.0")             # <<<<<<<<<<<<<<
@@ -15443,7 +15436,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3564
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3564
  *         if np.any(np.less_equal(oa, 1.0)):
  *             raise ValueError("a <= 1.0")
  *         return discd_array(self.internal_state, rk_zipf, size, oa)             # <<<<<<<<<<<<<<
@@ -15476,7 +15469,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3566
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3566
  *         return discd_array(self.internal_state, rk_zipf, size, oa)
  * 
  *     def geometric(self, p, size=None):             # <<<<<<<<<<<<<<
@@ -15546,7 +15539,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3614
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3614
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -15555,7 +15548,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3615
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3615
  * 
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15565,7 +15558,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3616
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3616
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():
  *             if fp < 0.0:             # <<<<<<<<<<<<<<
@@ -15575,7 +15568,7 @@
     __pyx_t_1 = (__pyx_v_fp < 0.0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3617
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3617
  *         if not PyErr_Occurred():
  *             if fp < 0.0:
  *                 raise ValueError("p < 0.0")             # <<<<<<<<<<<<<<
@@ -15597,7 +15590,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3618
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3618
  *             if fp < 0.0:
  *                 raise ValueError("p < 0.0")
  *             if fp > 1.0:             # <<<<<<<<<<<<<<
@@ -15607,7 +15600,7 @@
     __pyx_t_1 = (__pyx_v_fp > 1.0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3619
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3619
  *                 raise ValueError("p < 0.0")
  *             if fp > 1.0:
  *                 raise ValueError("p > 1.0")             # <<<<<<<<<<<<<<
@@ -15629,7 +15622,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3620
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3620
  *             if fp > 1.0:
  *                 raise ValueError("p > 1.0")
  *             return discd_array_sc(self.internal_state, rk_geometric, size, fp)             # <<<<<<<<<<<<<<
@@ -15646,7 +15639,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3622
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3622
  *             return discd_array_sc(self.internal_state, rk_geometric, size, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -15655,7 +15648,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3625
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3625
  * 
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -15669,7 +15662,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3626
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3626
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(op, 0.0)):             # <<<<<<<<<<<<<<
@@ -15713,7 +15706,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3627
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3627
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(op, 0.0)):
  *             raise ValueError("p < 0.0")             # <<<<<<<<<<<<<<
@@ -15735,7 +15728,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3628
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3628
  *         if np.any(np.less(op, 0.0)):
  *             raise ValueError("p < 0.0")
  *         if np.any(np.greater(op, 1.0)):             # <<<<<<<<<<<<<<
@@ -15779,7 +15772,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3629
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3629
  *             raise ValueError("p < 0.0")
  *         if np.any(np.greater(op, 1.0)):
  *             raise ValueError("p > 1.0")             # <<<<<<<<<<<<<<
@@ -15801,7 +15794,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3630
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3630
  *         if np.any(np.greater(op, 1.0)):
  *             raise ValueError("p > 1.0")
  *         return discd_array(self.internal_state, rk_geometric, size, op)             # <<<<<<<<<<<<<<
@@ -15834,7 +15827,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3632
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3632
  *         return discd_array(self.internal_state, rk_geometric, size, op)
  * 
  *     def hypergeometric(self, ngood, nbad, nsample, size=None):             # <<<<<<<<<<<<<<
@@ -15935,7 +15928,7 @@
   __pyx_v_onbad = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_onsample = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3719
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3719
  *         cdef long lngood, lnbad, lnsample
  * 
  *         lngood = PyInt_AsLong(ngood)             # <<<<<<<<<<<<<<
@@ -15944,7 +15937,7 @@
  */
   __pyx_v_lngood = PyInt_AsLong(__pyx_v_ngood);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3720
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3720
  * 
  *         lngood = PyInt_AsLong(ngood)
  *         lnbad = PyInt_AsLong(nbad)             # <<<<<<<<<<<<<<
@@ -15953,7 +15946,7 @@
  */
   __pyx_v_lnbad = PyInt_AsLong(__pyx_v_nbad);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3721
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3721
  *         lngood = PyInt_AsLong(ngood)
  *         lnbad = PyInt_AsLong(nbad)
  *         lnsample = PyInt_AsLong(nsample)             # <<<<<<<<<<<<<<
@@ -15962,7 +15955,7 @@
  */
   __pyx_v_lnsample = PyInt_AsLong(__pyx_v_nsample);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3722
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3722
  *         lnbad = PyInt_AsLong(nbad)
  *         lnsample = PyInt_AsLong(nsample)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15972,7 +15965,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3723
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3723
  *         lnsample = PyInt_AsLong(nsample)
  *         if not PyErr_Occurred():
  *             if ngood < 1:             # <<<<<<<<<<<<<<
@@ -15985,7 +15978,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3724
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3724
  *         if not PyErr_Occurred():
  *             if ngood < 1:
  *                 raise ValueError("ngood < 1")             # <<<<<<<<<<<<<<
@@ -16007,7 +16000,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3725
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3725
  *             if ngood < 1:
  *                 raise ValueError("ngood < 1")
  *             if nbad < 1:             # <<<<<<<<<<<<<<
@@ -16020,7 +16013,7 @@
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3726
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3726
  *                 raise ValueError("ngood < 1")
  *             if nbad < 1:
  *                 raise ValueError("nbad < 1")             # <<<<<<<<<<<<<<
@@ -16042,7 +16035,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3727
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3727
  *             if nbad < 1:
  *                 raise ValueError("nbad < 1")
  *             if nsample < 1:             # <<<<<<<<<<<<<<
@@ -16055,7 +16048,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3728
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3728
  *                 raise ValueError("nbad < 1")
  *             if nsample < 1:
  *                 raise ValueError("nsample < 1")             # <<<<<<<<<<<<<<
@@ -16077,7 +16070,7 @@
     }
     __pyx_L9:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3729
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3729
  *             if nsample < 1:
  *                 raise ValueError("nsample < 1")
  *             if ngood + nbad < nsample:             # <<<<<<<<<<<<<<
@@ -16093,7 +16086,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3730
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3730
  *                 raise ValueError("nsample < 1")
  *             if ngood + nbad < nsample:
  *                 raise ValueError("ngood + nbad < nsample")             # <<<<<<<<<<<<<<
@@ -16115,7 +16108,7 @@
     }
     __pyx_L10:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3731
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3731
  *             if ngood + nbad < nsample:
  *                 raise ValueError("ngood + nbad < nsample")
  *             return discnmN_array_sc(self.internal_state, rk_hypergeometric, size,             # <<<<<<<<<<<<<<
@@ -16124,7 +16117,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3732
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3732
  *                 raise ValueError("ngood + nbad < nsample")
  *             return discnmN_array_sc(self.internal_state, rk_hypergeometric, size,
  *                                     lngood, lnbad, lnsample)             # <<<<<<<<<<<<<<
@@ -16140,7 +16133,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3735
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3735
  * 
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -16149,7 +16142,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3737
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3737
  *         PyErr_Clear()
  * 
  *         ongood = <ndarray>PyArray_FROM_OTF(ngood, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16163,7 +16156,7 @@
   __pyx_v_ongood = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3738
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3738
  * 
  *         ongood = <ndarray>PyArray_FROM_OTF(ngood, NPY_LONG, NPY_ALIGNED)
  *         onbad = <ndarray>PyArray_FROM_OTF(nbad, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16177,7 +16170,7 @@
   __pyx_v_onbad = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3739
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3739
  *         ongood = <ndarray>PyArray_FROM_OTF(ngood, NPY_LONG, NPY_ALIGNED)
  *         onbad = <ndarray>PyArray_FROM_OTF(nbad, NPY_LONG, NPY_ALIGNED)
  *         onsample = <ndarray>PyArray_FROM_OTF(nsample, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16191,7 +16184,7 @@
   __pyx_v_onsample = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3740
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3740
  *         onbad = <ndarray>PyArray_FROM_OTF(nbad, NPY_LONG, NPY_ALIGNED)
  *         onsample = <ndarray>PyArray_FROM_OTF(nsample, NPY_LONG, NPY_ALIGNED)
  *         if np.any(np.less(ongood, 1)):             # <<<<<<<<<<<<<<
@@ -16233,7 +16226,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3741
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3741
  *         onsample = <ndarray>PyArray_FROM_OTF(nsample, NPY_LONG, NPY_ALIGNED)
  *         if np.any(np.less(ongood, 1)):
  *             raise ValueError("ngood < 1")             # <<<<<<<<<<<<<<
@@ -16255,7 +16248,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3742
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3742
  *         if np.any(np.less(ongood, 1)):
  *             raise ValueError("ngood < 1")
  *         if np.any(np.less(onbad, 1)):             # <<<<<<<<<<<<<<
@@ -16297,7 +16290,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3743
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3743
  *             raise ValueError("ngood < 1")
  *         if np.any(np.less(onbad, 1)):
  *             raise ValueError("nbad < 1")             # <<<<<<<<<<<<<<
@@ -16319,7 +16312,7 @@
   }
   __pyx_L12:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3744
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3744
  *         if np.any(np.less(onbad, 1)):
  *             raise ValueError("nbad < 1")
  *         if np.any(np.less(onsample, 1)):             # <<<<<<<<<<<<<<
@@ -16361,7 +16354,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3745
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3745
  *             raise ValueError("nbad < 1")
  *         if np.any(np.less(onsample, 1)):
  *             raise ValueError("nsample < 1")             # <<<<<<<<<<<<<<
@@ -16383,7 +16376,7 @@
   }
   __pyx_L13:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3746
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3746
  *         if np.any(np.less(onsample, 1)):
  *             raise ValueError("nsample < 1")
  *         if np.any(np.less(np.add(ongood, onbad),onsample)):             # <<<<<<<<<<<<<<
@@ -16442,7 +16435,7 @@
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3747
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3747
  *             raise ValueError("nsample < 1")
  *         if np.any(np.less(np.add(ongood, onbad),onsample)):
  *             raise ValueError("ngood + nbad < nsample")             # <<<<<<<<<<<<<<
@@ -16464,7 +16457,7 @@
   }
   __pyx_L14:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3748
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3748
  *         if np.any(np.less(np.add(ongood, onbad),onsample)):
  *             raise ValueError("ngood + nbad < nsample")
  *         return discnmN_array(self.internal_state, rk_hypergeometric, size,             # <<<<<<<<<<<<<<
@@ -16473,7 +16466,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3749
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3749
  *             raise ValueError("ngood + nbad < nsample")
  *         return discnmN_array(self.internal_state, rk_hypergeometric, size,
  *             ongood, onbad, onsample)             # <<<<<<<<<<<<<<
@@ -16510,7 +16503,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3751
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3751
  *             ongood, onbad, onsample)
  * 
  *     def logseries(self, p, size=None):             # <<<<<<<<<<<<<<
@@ -16580,7 +16573,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3828
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3828
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -16589,7 +16582,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3829
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3829
  * 
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -16599,7 +16592,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3830
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3830
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():
  *             if fp <= 0.0:             # <<<<<<<<<<<<<<
@@ -16609,7 +16602,7 @@
     __pyx_t_1 = (__pyx_v_fp <= 0.0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3831
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3831
  *         if not PyErr_Occurred():
  *             if fp <= 0.0:
  *                 raise ValueError("p <= 0.0")             # <<<<<<<<<<<<<<
@@ -16631,7 +16624,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3832
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3832
  *             if fp <= 0.0:
  *                 raise ValueError("p <= 0.0")
  *             if fp >= 1.0:             # <<<<<<<<<<<<<<
@@ -16641,7 +16634,7 @@
     __pyx_t_1 = (__pyx_v_fp >= 1.0);
     if (__pyx_t_1) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3833
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3833
  *                 raise ValueError("p <= 0.0")
  *             if fp >= 1.0:
  *                 raise ValueError("p >= 1.0")             # <<<<<<<<<<<<<<
@@ -16663,7 +16656,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3834
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3834
  *             if fp >= 1.0:
  *                 raise ValueError("p >= 1.0")
  *             return discd_array_sc(self.internal_state, rk_logseries, size, fp)             # <<<<<<<<<<<<<<
@@ -16680,7 +16673,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3836
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3836
  *             return discd_array_sc(self.internal_state, rk_logseries, size, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -16689,7 +16682,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3838
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3838
  *         PyErr_Clear()
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16703,7 +16696,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3839
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3839
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(op, 0.0)):             # <<<<<<<<<<<<<<
@@ -16747,7 +16740,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3840
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3840
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(op, 0.0)):
  *             raise ValueError("p <= 0.0")             # <<<<<<<<<<<<<<
@@ -16769,7 +16762,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3841
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3841
  *         if np.any(np.less_equal(op, 0.0)):
  *             raise ValueError("p <= 0.0")
  *         if np.any(np.greater_equal(op, 1.0)):             # <<<<<<<<<<<<<<
@@ -16813,7 +16806,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3842
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3842
  *             raise ValueError("p <= 0.0")
  *         if np.any(np.greater_equal(op, 1.0)):
  *             raise ValueError("p >= 1.0")             # <<<<<<<<<<<<<<
@@ -16835,7 +16828,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3843
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3843
  *         if np.any(np.greater_equal(op, 1.0)):
  *             raise ValueError("p >= 1.0")
  *         return discd_array(self.internal_state, rk_logseries, size, op)             # <<<<<<<<<<<<<<
@@ -16868,7 +16861,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3846
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3846
  * 
  *     # Multivariate distributions:
  *     def multivariate_normal(self, mean, cov, size=None):             # <<<<<<<<<<<<<<
@@ -16966,7 +16959,7 @@
   __pyx_v_s = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_v = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3939
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3939
  *         """
  *         # Check preconditions on arguments
  *         mean = np.array(mean)             # <<<<<<<<<<<<<<
@@ -16991,7 +16984,7 @@
   __pyx_v_mean = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3940
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3940
  *         # Check preconditions on arguments
  *         mean = np.array(mean)
  *         cov = np.array(cov)             # <<<<<<<<<<<<<<
@@ -17016,7 +17009,7 @@
   __pyx_v_cov = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3941
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3941
  *         mean = np.array(mean)
  *         cov = np.array(cov)
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -17026,7 +17019,7 @@
   __pyx_t_4 = (__pyx_v_size == Py_None);
   if (__pyx_t_4) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3942
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3942
  *         cov = np.array(cov)
  *         if size is None:
  *             shape = []             # <<<<<<<<<<<<<<
@@ -17042,7 +17035,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3944
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3944
  *             shape = []
  *         else:
  *             shape = size             # <<<<<<<<<<<<<<
@@ -17055,7 +17048,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3945
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3945
  *         else:
  *             shape = size
  *         if len(mean.shape) != 1:             # <<<<<<<<<<<<<<
@@ -17069,7 +17062,7 @@
   __pyx_t_4 = (__pyx_t_5 != 1);
   if (__pyx_t_4) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3946
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3946
  *             shape = size
  *         if len(mean.shape) != 1:
  *                raise ValueError("mean must be 1 dimensional")             # <<<<<<<<<<<<<<
@@ -17091,7 +17084,7 @@
   }
   __pyx_L7:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3947
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3947
  *         if len(mean.shape) != 1:
  *                raise ValueError("mean must be 1 dimensional")
  *         if (len(cov.shape) != 2) or (cov.shape[0] != cov.shape[1]):             # <<<<<<<<<<<<<<
@@ -17126,7 +17119,7 @@
   }
   if (__pyx_t_7) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3948
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3948
  *                raise ValueError("mean must be 1 dimensional")
  *         if (len(cov.shape) != 2) or (cov.shape[0] != cov.shape[1]):
  *                raise ValueError("cov must be 2 dimensional and square")             # <<<<<<<<<<<<<<
@@ -17148,7 +17141,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3949
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3949
  *         if (len(cov.shape) != 2) or (cov.shape[0] != cov.shape[1]):
  *                raise ValueError("cov must be 2 dimensional and square")
  *         if mean.shape[0] != cov.shape[0]:             # <<<<<<<<<<<<<<
@@ -17173,7 +17166,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_7) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3950
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3950
  *                raise ValueError("cov must be 2 dimensional and square")
  *         if mean.shape[0] != cov.shape[0]:
  *                raise ValueError("mean and cov must have same length")             # <<<<<<<<<<<<<<
@@ -17195,7 +17188,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3952
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3952
  *                raise ValueError("mean and cov must have same length")
  *         # Compute shape of output
  *         if isinstance(shape, int):             # <<<<<<<<<<<<<<
@@ -17205,7 +17198,7 @@
   __pyx_t_7 = PyObject_TypeCheck(__pyx_v_shape, ((PyTypeObject *)((PyObject*)&PyInt_Type))); 
   if (__pyx_t_7) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3953
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3953
  *         # Compute shape of output
  *         if isinstance(shape, int):
  *             shape = [shape]             # <<<<<<<<<<<<<<
@@ -17224,7 +17217,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3954
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3954
  *         if isinstance(shape, int):
  *             shape = [shape]
  *         final_shape = list(shape[:])             # <<<<<<<<<<<<<<
@@ -17245,7 +17238,7 @@
   __pyx_v_final_shape = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3955
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3955
  *             shape = [shape]
  *         final_shape = list(shape[:])
  *         final_shape.append(mean.shape[0])             # <<<<<<<<<<<<<<
@@ -17262,7 +17255,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3959
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3959
  *         # numbers. The matrix has rows with the same length as mean and as
  *         # many rows are necessary to form a matrix of shape final_shape.
  *         x = self.standard_normal(np.multiply.reduce(final_shape))             # <<<<<<<<<<<<<<
@@ -17301,7 +17294,7 @@
   __pyx_v_x = __pyx_t_8;
   __pyx_t_8 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3960
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3960
  *         # many rows are necessary to form a matrix of shape final_shape.
  *         x = self.standard_normal(np.multiply.reduce(final_shape))
  *         x.shape = (np.multiply.reduce(final_shape[0:len(final_shape)-1]),             # <<<<<<<<<<<<<<
@@ -17329,7 +17322,7 @@
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3961
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3961
  *         x = self.standard_normal(np.multiply.reduce(final_shape))
  *         x.shape = (np.multiply.reduce(final_shape[0:len(final_shape)-1]),
  *                    mean.shape[0])             # <<<<<<<<<<<<<<
@@ -17350,7 +17343,7 @@
   __pyx_t_3 = 0;
   __pyx_t_8 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3960
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3960
  *         # many rows are necessary to form a matrix of shape final_shape.
  *         x = self.standard_normal(np.multiply.reduce(final_shape))
  *         x.shape = (np.multiply.reduce(final_shape[0:len(final_shape)-1]),             # <<<<<<<<<<<<<<
@@ -17360,7 +17353,7 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_s__shape, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3960; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3969
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3969
  *         # decomposition of cov is such an A.
  * 
  *         from numpy.dual import svd             # <<<<<<<<<<<<<<
@@ -17383,7 +17376,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3971
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3971
  *         from numpy.dual import svd
  *         # XXX: we really should be doing this by Cholesky decomposition
  *         (u,s,v) = svd(cov)             # <<<<<<<<<<<<<<
@@ -17436,7 +17429,7 @@
     __pyx_t_1 = 0;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3972
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3972
  *         # XXX: we really should be doing this by Cholesky decomposition
  *         (u,s,v) = svd(cov)
  *         x = np.dot(x*np.sqrt(s),v)             # <<<<<<<<<<<<<<
@@ -17481,7 +17474,7 @@
   __pyx_v_x = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3975
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3975
  *         # The rows of x now have the correct covariance but mean 0. Add
  *         # mean to each row. Then each row will have mean mean.
  *         np.add(mean,x,x)             # <<<<<<<<<<<<<<
@@ -17510,7 +17503,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3976
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3976
  *         # mean to each row. Then each row will have mean mean.
  *         np.add(mean,x,x)
  *         x.shape = tuple(final_shape)             # <<<<<<<<<<<<<<
@@ -17528,7 +17521,7 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_s__shape, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3976; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3977
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3977
  *         np.add(mean,x,x)
  *         x.shape = tuple(final_shape)
  *         return x             # <<<<<<<<<<<<<<
@@ -17567,7 +17560,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3979
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3979
  *         return x
  * 
  *     def multinomial(self, long n, object pvals, size=None):             # <<<<<<<<<<<<<<
@@ -17663,7 +17656,7 @@
   __pyx_v_shape = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_multin = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4038
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4038
  *         cdef double Sum
  * 
  *         d = len(pvals)             # <<<<<<<<<<<<<<
@@ -17673,7 +17666,7 @@
   __pyx_t_1 = PyObject_Length(__pyx_v_pvals); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4038; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_d = __pyx_t_1;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4039
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4039
  * 
  *         d = len(pvals)
  *         parr = <ndarray>PyArray_ContiguousFromObject(pvals, NPY_DOUBLE, 1, 1)             # <<<<<<<<<<<<<<
@@ -17687,7 +17680,7 @@
   arrayObject_parr = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4040
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4040
  *         d = len(pvals)
  *         parr = <ndarray>PyArray_ContiguousFromObject(pvals, NPY_DOUBLE, 1, 1)
  *         pix = <double*>parr.data             # <<<<<<<<<<<<<<
@@ -17696,7 +17689,7 @@
  */
   __pyx_v_pix = ((double *)arrayObject_parr->data);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4042
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4042
  *         pix = <double*>parr.data
  * 
  *         if kahan_sum(pix, d-1) > (1.0 + 1e-12):             # <<<<<<<<<<<<<<
@@ -17706,7 +17699,7 @@
   __pyx_t_3 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix, (__pyx_v_d - 1)) > (1.0 + 9.9999999999999998e-13));
   if (__pyx_t_3) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4043
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4043
  * 
  *         if kahan_sum(pix, d-1) > (1.0 + 1e-12):
  *             raise ValueError("sum(pvals[:-1]) > 1.0")             # <<<<<<<<<<<<<<
@@ -17728,7 +17721,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4045
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4045
  *             raise ValueError("sum(pvals[:-1]) > 1.0")
  * 
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -17738,7 +17731,7 @@
   __pyx_t_3 = (__pyx_v_size == Py_None);
   if (__pyx_t_3) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4046
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4046
  * 
  *         if size is None:
  *             shape = (d,)             # <<<<<<<<<<<<<<
@@ -17758,17 +17751,20 @@
     goto __pyx_L7;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4047
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4047
  *         if size is None:
  *             shape = (d,)
  *         elif type(size) is int:             # <<<<<<<<<<<<<<
  *             shape = (size, d)
  *         else:
  */
-  __pyx_t_3 = (((PyObject *)Py_TYPE(__pyx_v_size)) == ((PyObject *)((PyObject*)&PyInt_Type)));
+  __pyx_t_2 = ((PyObject *)__Pyx_Type(__pyx_v_size)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4047; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __pyx_t_3 = (__pyx_t_2 == ((PyObject*)&PyInt_Type));
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
   if (__pyx_t_3) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4048
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4048
  *             shape = (d,)
  *         elif type(size) is int:
  *             shape = (size, d)             # <<<<<<<<<<<<<<
@@ -17792,7 +17788,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4050
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4050
  *             shape = (size, d)
  *         else:
  *             shape = size + (d,)             # <<<<<<<<<<<<<<
@@ -17815,7 +17811,7 @@
   }
   __pyx_L7:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4052
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4052
  *             shape = size + (d,)
  * 
  *         multin = np.zeros(shape, int)             # <<<<<<<<<<<<<<
@@ -17843,7 +17839,7 @@
   __pyx_v_multin = __pyx_t_5;
   __pyx_t_5 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4053
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4053
  * 
  *         multin = np.zeros(shape, int)
  *         mnarr = <ndarray>multin             # <<<<<<<<<<<<<<
@@ -17854,7 +17850,7 @@
   __Pyx_DECREF(((PyObject *)arrayObject_mnarr));
   arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4054
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4054
  *         multin = np.zeros(shape, int)
  *         mnarr = <ndarray>multin
  *         mnix = <long*>mnarr.data             # <<<<<<<<<<<<<<
@@ -17863,7 +17859,7 @@
  */
   __pyx_v_mnix = ((long *)arrayObject_mnarr->data);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4055
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4055
  *         mnarr = <ndarray>multin
  *         mnix = <long*>mnarr.data
  *         i = 0             # <<<<<<<<<<<<<<
@@ -17872,7 +17868,7 @@
  */
   __pyx_v_i = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4056
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4056
  *         mnix = <long*>mnarr.data
  *         i = 0
  *         while i < PyArray_SIZE(mnarr):             # <<<<<<<<<<<<<<
@@ -17883,7 +17879,7 @@
     __pyx_t_3 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
     if (!__pyx_t_3) break;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4057
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4057
  *         i = 0
  *         while i < PyArray_SIZE(mnarr):
  *             Sum = 1.0             # <<<<<<<<<<<<<<
@@ -17892,7 +17888,7 @@
  */
     __pyx_v_Sum = 1.0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4058
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4058
  *         while i < PyArray_SIZE(mnarr):
  *             Sum = 1.0
  *             dn = n             # <<<<<<<<<<<<<<
@@ -17901,7 +17897,7 @@
  */
     __pyx_v_dn = __pyx_v_n;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4059
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4059
  *             Sum = 1.0
  *             dn = n
  *             for j from 0 <= j < d-1:             # <<<<<<<<<<<<<<
@@ -17911,7 +17907,7 @@
     __pyx_t_6 = (__pyx_v_d - 1);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_6; __pyx_v_j++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4060
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4060
  *             dn = n
  *             for j from 0 <= j < d-1:
  *                 mnix[i+j] = rk_binomial(self.internal_state, dn, pix[j]/Sum)             # <<<<<<<<<<<<<<
@@ -17925,7 +17921,7 @@
       }
       (__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_t_7 / __pyx_v_Sum));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4061
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4061
  *             for j from 0 <= j < d-1:
  *                 mnix[i+j] = rk_binomial(self.internal_state, dn, pix[j]/Sum)
  *                 dn = dn - mnix[i+j]             # <<<<<<<<<<<<<<
@@ -17934,7 +17930,7 @@
  */
       __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4062
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4062
  *                 mnix[i+j] = rk_binomial(self.internal_state, dn, pix[j]/Sum)
  *                 dn = dn - mnix[i+j]
  *                 if dn <= 0:             # <<<<<<<<<<<<<<
@@ -17944,7 +17940,7 @@
       __pyx_t_3 = (__pyx_v_dn <= 0);
       if (__pyx_t_3) {
 
-        /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4063
+        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4063
  *                 dn = dn - mnix[i+j]
  *                 if dn <= 0:
  *                     break             # <<<<<<<<<<<<<<
@@ -17956,7 +17952,7 @@
       }
       __pyx_L12:;
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4064
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4064
  *                 if dn <= 0:
  *                     break
  *                 Sum = Sum - pix[j]             # <<<<<<<<<<<<<<
@@ -17967,7 +17963,7 @@
     }
     __pyx_L11_break:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4065
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4065
  *                     break
  *                 Sum = Sum - pix[j]
  *             if dn > 0:             # <<<<<<<<<<<<<<
@@ -17977,7 +17973,7 @@
     __pyx_t_3 = (__pyx_v_dn > 0);
     if (__pyx_t_3) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4066
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4066
  *                 Sum = Sum - pix[j]
  *             if dn > 0:
  *                 mnix[i+d-1] = dn             # <<<<<<<<<<<<<<
@@ -17989,7 +17985,7 @@
     }
     __pyx_L13:;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4068
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4068
  *                 mnix[i+d-1] = dn
  * 
  *             i = i + d             # <<<<<<<<<<<<<<
@@ -17999,7 +17995,7 @@
     __pyx_v_i = (__pyx_v_i + __pyx_v_d);
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4070
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4070
  *             i = i + d
  * 
  *         return multin             # <<<<<<<<<<<<<<
@@ -18032,7 +18028,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4072
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4072
  *         return multin
  * 
  *     def dirichlet(self, object alpha, size=None):             # <<<<<<<<<<<<<<
@@ -18116,7 +18112,7 @@
   __pyx_v_shape = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_diric = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4136
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4136
  *         cdef double     acc, invacc
  * 
  *         k           = len(alpha)             # <<<<<<<<<<<<<<
@@ -18126,7 +18122,7 @@
   __pyx_t_1 = PyObject_Length(__pyx_v_alpha); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_k = __pyx_t_1;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4137
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4137
  * 
  *         k           = len(alpha)
  *         alpha_arr   = <ndarray>PyArray_ContiguousFromObject(alpha, NPY_DOUBLE, 1, 1)             # <<<<<<<<<<<<<<
@@ -18140,7 +18136,7 @@
   __pyx_v_alpha_arr = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4138
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4138
  *         k           = len(alpha)
  *         alpha_arr   = <ndarray>PyArray_ContiguousFromObject(alpha, NPY_DOUBLE, 1, 1)
  *         alpha_data  = <double*>alpha_arr.data             # <<<<<<<<<<<<<<
@@ -18149,7 +18145,7 @@
  */
   __pyx_v_alpha_data = ((double *)__pyx_v_alpha_arr->data);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4140
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4140
  *         alpha_data  = <double*>alpha_arr.data
  * 
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -18159,7 +18155,7 @@
   __pyx_t_3 = (__pyx_v_size == Py_None);
   if (__pyx_t_3) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4141
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4141
  * 
  *         if size is None:
  *             shape = (k,)             # <<<<<<<<<<<<<<
@@ -18179,17 +18175,20 @@
     goto __pyx_L6;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4142
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4142
  *         if size is None:
  *             shape = (k,)
  *         elif type(size) is int:             # <<<<<<<<<<<<<<
  *             shape = (size, k)
  *         else:
  */
-  __pyx_t_3 = (((PyObject *)Py_TYPE(__pyx_v_size)) == ((PyObject *)((PyObject*)&PyInt_Type)));
+  __pyx_t_4 = ((PyObject *)__Pyx_Type(__pyx_v_size)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+  __pyx_t_3 = (__pyx_t_4 == ((PyObject*)&PyInt_Type));
+  __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
   if (__pyx_t_3) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4143
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4143
  *             shape = (k,)
  *         elif type(size) is int:
  *             shape = (size, k)             # <<<<<<<<<<<<<<
@@ -18213,7 +18212,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4145
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4145
  *             shape = (size, k)
  *         else:
  *             shape = size + (k,)             # <<<<<<<<<<<<<<
@@ -18236,7 +18235,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4147
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4147
  *             shape = size + (k,)
  * 
  *         diric   = np.zeros(shape, np.float64)             # <<<<<<<<<<<<<<
@@ -18269,7 +18268,7 @@
   __pyx_v_diric = __pyx_t_5;
   __pyx_t_5 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4148
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4148
  * 
  *         diric   = np.zeros(shape, np.float64)
  *         val_arr = <ndarray>diric             # <<<<<<<<<<<<<<
@@ -18280,7 +18279,7 @@
   __Pyx_DECREF(((PyObject *)__pyx_v_val_arr));
   __pyx_v_val_arr = ((PyArrayObject *)__pyx_v_diric);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4149
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4149
  *         diric   = np.zeros(shape, np.float64)
  *         val_arr = <ndarray>diric
  *         val_data= <double*>val_arr.data             # <<<<<<<<<<<<<<
@@ -18289,7 +18288,7 @@
  */
   __pyx_v_val_data = ((double *)__pyx_v_val_arr->data);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4151
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4151
  *         val_data= <double*>val_arr.data
  * 
  *         i = 0             # <<<<<<<<<<<<<<
@@ -18298,7 +18297,7 @@
  */
   __pyx_v_i = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4152
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4152
  * 
  *         i = 0
  *         totsize = PyArray_SIZE(val_arr)             # <<<<<<<<<<<<<<
@@ -18307,7 +18306,7 @@
  */
   __pyx_v_totsize = PyArray_SIZE(__pyx_v_val_arr);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4153
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4153
  *         i = 0
  *         totsize = PyArray_SIZE(val_arr)
  *         while i < totsize:             # <<<<<<<<<<<<<<
@@ -18318,7 +18317,7 @@
     __pyx_t_3 = (__pyx_v_i < __pyx_v_totsize);
     if (!__pyx_t_3) break;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4154
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4154
  *         totsize = PyArray_SIZE(val_arr)
  *         while i < totsize:
  *             acc = 0.0             # <<<<<<<<<<<<<<
@@ -18327,7 +18326,7 @@
  */
     __pyx_v_acc = 0.0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4155
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4155
  *         while i < totsize:
  *             acc = 0.0
  *             for j from 0 <= j < k:             # <<<<<<<<<<<<<<
@@ -18337,7 +18336,7 @@
     __pyx_t_6 = __pyx_v_k;
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_6; __pyx_v_j++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4156
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4156
  *             acc = 0.0
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = rk_standard_gamma(self.internal_state, alpha_data[j])             # <<<<<<<<<<<<<<
@@ -18346,7 +18345,7 @@
  */
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = rk_standard_gamma(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state, (__pyx_v_alpha_data[__pyx_v_j]));
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4157
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4157
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = rk_standard_gamma(self.internal_state, alpha_data[j])
  *                 acc             = acc + val_data[i+j]             # <<<<<<<<<<<<<<
@@ -18356,7 +18355,7 @@
       __pyx_v_acc = (__pyx_v_acc + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]));
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4158
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4158
  *                 val_data[i+j]   = rk_standard_gamma(self.internal_state, alpha_data[j])
  *                 acc             = acc + val_data[i+j]
  *             invacc  = 1/acc             # <<<<<<<<<<<<<<
@@ -18369,7 +18368,7 @@
     }
     __pyx_v_invacc = (1 / __pyx_v_acc);
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4159
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4159
  *                 acc             = acc + val_data[i+j]
  *             invacc  = 1/acc
  *             for j from 0 <= j < k:             # <<<<<<<<<<<<<<
@@ -18379,7 +18378,7 @@
     __pyx_t_6 = __pyx_v_k;
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_6; __pyx_v_j++) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4160
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4160
  *             invacc  = 1/acc
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = val_data[i+j] * invacc             # <<<<<<<<<<<<<<
@@ -18389,7 +18388,7 @@
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = ((__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) * __pyx_v_invacc);
     }
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4161
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4161
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = val_data[i+j] * invacc
  *             i = i + k             # <<<<<<<<<<<<<<
@@ -18399,7 +18398,7 @@
     __pyx_v_i = (__pyx_v_i + __pyx_v_k);
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4163
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4163
  *             i = i + k
  * 
  *         return diric             # <<<<<<<<<<<<<<
@@ -18432,7 +18431,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4166
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4166
  * 
  *     # Shuffling and permutations:
  *     def shuffle(self, object x):             # <<<<<<<<<<<<<<
@@ -18457,7 +18456,7 @@
   __Pyx_INCREF((PyObject *)__pyx_v_self);
   __Pyx_INCREF(__pyx_v_x);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4176
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4176
  *         cdef int copy
  * 
  *         i = len(x) - 1             # <<<<<<<<<<<<<<
@@ -18467,7 +18466,7 @@
   __pyx_t_1 = PyObject_Length(__pyx_v_x); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_i = (__pyx_t_1 - 1);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4177
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4177
  * 
  *         i = len(x) - 1
  *         try:             # <<<<<<<<<<<<<<
@@ -18482,7 +18481,7 @@
     __Pyx_XGOTREF(__pyx_save_exc_tb);
     /*try:*/ {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4178
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4178
  *         i = len(x) - 1
  *         try:
  *             j = len(x[0])             # <<<<<<<<<<<<<<
@@ -18502,7 +18501,7 @@
     __pyx_L5_error:;
     __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4179
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4179
  *         try:
  *             j = len(x[0])
  *         except:             # <<<<<<<<<<<<<<
@@ -18516,7 +18515,7 @@
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_GOTREF(__pyx_t_4);
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4180
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4180
  *             j = len(x[0])
  *         except:
  *             j = 0             # <<<<<<<<<<<<<<
@@ -18543,7 +18542,7 @@
     __pyx_L12_try_end:;
   }
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4182
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4182
  *             j = 0
  * 
  *         if (j == 0):             # <<<<<<<<<<<<<<
@@ -18553,7 +18552,7 @@
   __pyx_t_5 = (__pyx_v_j == 0);
   if (__pyx_t_5) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4184
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4184
  *         if (j == 0):
  *             # adaptation of random.shuffle()
  *             while i > 0:             # <<<<<<<<<<<<<<
@@ -18564,7 +18563,7 @@
       __pyx_t_5 = (__pyx_v_i > 0);
       if (!__pyx_t_5) break;
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4185
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4185
  *             # adaptation of random.shuffle()
  *             while i > 0:
  *                 j = rk_interval(i, self.internal_state)             # <<<<<<<<<<<<<<
@@ -18573,7 +18572,7 @@
  */
       __pyx_v_j = rk_interval(__pyx_v_i, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4186
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4186
  *             while i > 0:
  *                 j = rk_interval(i, self.internal_state)
  *                 x[i], x[j] = x[j], x[i]             # <<<<<<<<<<<<<<
@@ -18589,7 +18588,7 @@
       if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_t_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4186; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4187
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4187
  *                 j = rk_interval(i, self.internal_state)
  *                 x[i], x[j] = x[j], x[i]
  *                 i = i - 1             # <<<<<<<<<<<<<<
@@ -18602,7 +18601,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4190
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4190
  *         else:
  *             # make copies
  *             copy = hasattr(x[0], 'copy')             # <<<<<<<<<<<<<<
@@ -18615,7 +18614,7 @@
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_v_copy = __pyx_t_5;
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4191
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4191
  *             # make copies
  *             copy = hasattr(x[0], 'copy')
  *             if copy:             # <<<<<<<<<<<<<<
@@ -18625,7 +18624,7 @@
     __pyx_t_6 = __pyx_v_copy;
     if (__pyx_t_6) {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4192
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4192
  *             copy = hasattr(x[0], 'copy')
  *             if copy:
  *                 while(i > 0):             # <<<<<<<<<<<<<<
@@ -18636,7 +18635,7 @@
         __pyx_t_5 = (__pyx_v_i > 0);
         if (!__pyx_t_5) break;
 
-        /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4193
+        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4193
  *             if copy:
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)             # <<<<<<<<<<<<<<
@@ -18645,7 +18644,7 @@
  */
         __pyx_v_j = rk_interval(__pyx_v_i, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4194
+        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4194
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j].copy(), x[i].copy()             # <<<<<<<<<<<<<<
@@ -18673,7 +18672,7 @@
         if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_t_4, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-        /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4195
+        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4195
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j].copy(), x[i].copy()
  *                     i = i - 1             # <<<<<<<<<<<<<<
@@ -18686,7 +18685,7 @@
     }
     /*else*/ {
 
-      /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4197
+      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4197
  *                     i = i - 1
  *             else:
  *                 while(i > 0):             # <<<<<<<<<<<<<<
@@ -18697,7 +18696,7 @@
         __pyx_t_5 = (__pyx_v_i > 0);
         if (!__pyx_t_5) break;
 
-        /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4198
+        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4198
  *             else:
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)             # <<<<<<<<<<<<<<
@@ -18706,7 +18705,7 @@
  */
         __pyx_v_j = rk_interval(__pyx_v_i, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4199
+        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4199
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j][:], x[i][:]             # <<<<<<<<<<<<<<
@@ -18728,7 +18727,7 @@
         if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_t_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-        /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4200
+        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4200
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j][:], x[i][:]
  *                     i = i - 1             # <<<<<<<<<<<<<<
@@ -18758,7 +18757,7 @@
   return __pyx_r;
 }
 
-/* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4202
+/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4202
  *                     i = i - 1
  * 
  *     def permutation(self, object x):             # <<<<<<<<<<<<<<
@@ -18780,7 +18779,7 @@
   __Pyx_INCREF(__pyx_v_x);
   __pyx_v_arr = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4229
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4229
  * 
  *         """
  *         if isinstance(x, (int, np.integer)):             # <<<<<<<<<<<<<<
@@ -18804,7 +18803,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_3) {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4230
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4230
  *         """
  *         if isinstance(x, (int, np.integer)):
  *             arr = np.arange(x)             # <<<<<<<<<<<<<<
@@ -18832,7 +18831,7 @@
   }
   /*else*/ {
 
-    /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4232
+    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4232
  *             arr = np.arange(x)
  *         else:
  *             arr = np.array(x)             # <<<<<<<<<<<<<<
@@ -18859,7 +18858,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4233
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4233
  *         else:
  *             arr = np.array(x)
  *         self.shuffle(arr)             # <<<<<<<<<<<<<<
@@ -18879,7 +18878,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4234
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4234
  *             arr = np.array(x)
  *         self.shuffle(arr)
  *         return arr             # <<<<<<<<<<<<<<
@@ -19438,10 +19437,10 @@
   /*--- Global init code ---*/
   /*--- Function export code ---*/
   /*--- Type init code ---*/
-  __pyx_ptype_6mtrand_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_6mtrand_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_6mtrand_flatiter = __Pyx_ImportType("numpy", "flatiter", sizeof(PyArrayIterObject), 0); if (unlikely(!__pyx_ptype_6mtrand_flatiter)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_6mtrand_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject), 0); if (unlikely(!__pyx_ptype_6mtrand_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr)); if (unlikely(!__pyx_ptype_6mtrand_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (unlikely(!__pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_flatiter = __Pyx_ImportType("numpy", "flatiter", sizeof(PyArrayIterObject)); if (unlikely(!__pyx_ptype_6mtrand_flatiter)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject)); if (unlikely(!__pyx_ptype_6mtrand_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (PyType_Ready(&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__Pyx_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState;
@@ -19449,7 +19448,7 @@
   /*--- Function import code ---*/
   /*--- Execution code ---*/
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":124
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":124
  * 
  * # Initialize numpy
  * import_array()             # <<<<<<<<<<<<<<
@@ -19458,7 +19457,7 @@
  */
   import_array();
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":126
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":126
  * import_array()
  * 
  * import numpy as np             # <<<<<<<<<<<<<<
@@ -19470,7 +19469,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__np, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":893
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":893
  *         return bytestring
  * 
  *     def uniform(self, low=0.0, high=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19488,7 +19487,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1190
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1190
  *         return cont0_array(self.internal_state, rk_gauss, size)
  * 
  *     def normal(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19506,7 +19505,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1349
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1349
  *         return cont2_array(self.internal_state, rk_beta, size, oa, ob)
  * 
  *     def exponential(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19519,7 +19518,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1513
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1513
  *         return cont1_array(self.internal_state, rk_standard_gamma, size, oshape)
  * 
  *     def gamma(self, shape, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19532,7 +19531,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2529
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2529
  *         return cont1_array(self.internal_state, rk_power, size, oa)
  * 
  *     def laplace(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19550,7 +19549,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2619
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2619
  *         return cont2_array(self.internal_state, rk_laplace, size, oloc, oscale)
  * 
  *     def gumbel(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19568,7 +19567,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2743
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2743
  *         return cont2_array(self.internal_state, rk_gumbel, size, oloc, oscale)
  * 
  *     def logistic(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19586,7 +19585,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2831
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2831
  *         return cont2_array(self.internal_state, rk_logistic, size, oloc, oscale)
  * 
  *     def lognormal(self, mean=0.0, sigma=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19604,7 +19603,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":2962
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2962
  *         return cont2_array(self.internal_state, rk_lognormal, size, omean, osigma)
  * 
  *     def rayleigh(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19617,7 +19616,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":3411
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3411
  *                             on, op)
  * 
  *     def poisson(self, lam=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19630,7 +19629,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4236
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4236
  *         return arr
  * 
  * _rand = RandomState()             # <<<<<<<<<<<<<<
@@ -19642,7 +19641,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s___rand, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4236; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4237
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4237
  * 
  * _rand = RandomState()
  * seed = _rand.seed             # <<<<<<<<<<<<<<
@@ -19657,7 +19656,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__seed, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4238
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4238
  * _rand = RandomState()
  * seed = _rand.seed
  * get_state = _rand.get_state             # <<<<<<<<<<<<<<
@@ -19672,7 +19671,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__get_state, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4239
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4239
  * seed = _rand.seed
  * get_state = _rand.get_state
  * set_state = _rand.set_state             # <<<<<<<<<<<<<<
@@ -19687,7 +19686,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__set_state, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4240
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4240
  * get_state = _rand.get_state
  * set_state = _rand.set_state
  * random_sample = _rand.random_sample             # <<<<<<<<<<<<<<
@@ -19702,7 +19701,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__random_sample, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4241
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4241
  * set_state = _rand.set_state
  * random_sample = _rand.random_sample
  * randint = _rand.randint             # <<<<<<<<<<<<<<
@@ -19717,7 +19716,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__randint, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4242
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4242
  * random_sample = _rand.random_sample
  * randint = _rand.randint
  * bytes = _rand.bytes             # <<<<<<<<<<<<<<
@@ -19732,7 +19731,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__bytes, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4243
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4243
  * randint = _rand.randint
  * bytes = _rand.bytes
  * uniform = _rand.uniform             # <<<<<<<<<<<<<<
@@ -19747,7 +19746,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__uniform, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4243; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4244
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4244
  * bytes = _rand.bytes
  * uniform = _rand.uniform
  * rand = _rand.rand             # <<<<<<<<<<<<<<
@@ -19762,7 +19761,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__rand, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4245
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4245
  * uniform = _rand.uniform
  * rand = _rand.rand
  * randn = _rand.randn             # <<<<<<<<<<<<<<
@@ -19777,7 +19776,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__randn, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4246
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4246
  * rand = _rand.rand
  * randn = _rand.randn
  * random_integers = _rand.random_integers             # <<<<<<<<<<<<<<
@@ -19792,7 +19791,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__random_integers, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4247
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4247
  * randn = _rand.randn
  * random_integers = _rand.random_integers
  * standard_normal = _rand.standard_normal             # <<<<<<<<<<<<<<
@@ -19807,7 +19806,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_normal, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4248
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4248
  * random_integers = _rand.random_integers
  * standard_normal = _rand.standard_normal
  * normal = _rand.normal             # <<<<<<<<<<<<<<
@@ -19822,7 +19821,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__normal, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4249
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4249
  * standard_normal = _rand.standard_normal
  * normal = _rand.normal
  * beta = _rand.beta             # <<<<<<<<<<<<<<
@@ -19837,7 +19836,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__beta, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4250
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4250
  * normal = _rand.normal
  * beta = _rand.beta
  * exponential = _rand.exponential             # <<<<<<<<<<<<<<
@@ -19852,7 +19851,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__exponential, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4250; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4251
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4251
  * beta = _rand.beta
  * exponential = _rand.exponential
  * standard_exponential = _rand.standard_exponential             # <<<<<<<<<<<<<<
@@ -19867,7 +19866,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s_59, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4251; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4252
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4252
  * exponential = _rand.exponential
  * standard_exponential = _rand.standard_exponential
  * standard_gamma = _rand.standard_gamma             # <<<<<<<<<<<<<<
@@ -19882,7 +19881,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_gamma, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4253
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4253
  * standard_exponential = _rand.standard_exponential
  * standard_gamma = _rand.standard_gamma
  * gamma = _rand.gamma             # <<<<<<<<<<<<<<
@@ -19897,7 +19896,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__gamma, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4254
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4254
  * standard_gamma = _rand.standard_gamma
  * gamma = _rand.gamma
  * f = _rand.f             # <<<<<<<<<<<<<<
@@ -19912,7 +19911,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__f, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4255
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4255
  * gamma = _rand.gamma
  * f = _rand.f
  * noncentral_f = _rand.noncentral_f             # <<<<<<<<<<<<<<
@@ -19927,7 +19926,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__noncentral_f, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4256
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4256
  * f = _rand.f
  * noncentral_f = _rand.noncentral_f
  * chisquare = _rand.chisquare             # <<<<<<<<<<<<<<
@@ -19942,7 +19941,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__chisquare, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4257
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4257
  * noncentral_f = _rand.noncentral_f
  * chisquare = _rand.chisquare
  * noncentral_chisquare = _rand.noncentral_chisquare             # <<<<<<<<<<<<<<
@@ -19957,7 +19956,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s_60, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4258
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4258
  * chisquare = _rand.chisquare
  * noncentral_chisquare = _rand.noncentral_chisquare
  * standard_cauchy = _rand.standard_cauchy             # <<<<<<<<<<<<<<
@@ -19972,7 +19971,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_cauchy, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4258; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4259
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4259
  * noncentral_chisquare = _rand.noncentral_chisquare
  * standard_cauchy = _rand.standard_cauchy
  * standard_t = _rand.standard_t             # <<<<<<<<<<<<<<
@@ -19987,7 +19986,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_t, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4259; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4260
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4260
  * standard_cauchy = _rand.standard_cauchy
  * standard_t = _rand.standard_t
  * vonmises = _rand.vonmises             # <<<<<<<<<<<<<<
@@ -20002,7 +20001,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__vonmises, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4261
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4261
  * standard_t = _rand.standard_t
  * vonmises = _rand.vonmises
  * pareto = _rand.pareto             # <<<<<<<<<<<<<<
@@ -20017,7 +20016,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__pareto, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4262
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4262
  * vonmises = _rand.vonmises
  * pareto = _rand.pareto
  * weibull = _rand.weibull             # <<<<<<<<<<<<<<
@@ -20032,7 +20031,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__weibull, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4262; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4263
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4263
  * pareto = _rand.pareto
  * weibull = _rand.weibull
  * power = _rand.power             # <<<<<<<<<<<<<<
@@ -20047,7 +20046,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__power, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4264
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4264
  * weibull = _rand.weibull
  * power = _rand.power
  * laplace = _rand.laplace             # <<<<<<<<<<<<<<
@@ -20062,7 +20061,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__laplace, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4264; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4265
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4265
  * power = _rand.power
  * laplace = _rand.laplace
  * gumbel = _rand.gumbel             # <<<<<<<<<<<<<<
@@ -20077,7 +20076,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__gumbel, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4266
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4266
  * laplace = _rand.laplace
  * gumbel = _rand.gumbel
  * logistic = _rand.logistic             # <<<<<<<<<<<<<<
@@ -20092,7 +20091,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__logistic, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4267
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4267
  * gumbel = _rand.gumbel
  * logistic = _rand.logistic
  * lognormal = _rand.lognormal             # <<<<<<<<<<<<<<
@@ -20107,7 +20106,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__lognormal, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4268
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4268
  * logistic = _rand.logistic
  * lognormal = _rand.lognormal
  * rayleigh = _rand.rayleigh             # <<<<<<<<<<<<<<
@@ -20122,7 +20121,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__rayleigh, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4268; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4269
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4269
  * lognormal = _rand.lognormal
  * rayleigh = _rand.rayleigh
  * wald = _rand.wald             # <<<<<<<<<<<<<<
@@ -20137,7 +20136,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__wald, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4270
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4270
  * rayleigh = _rand.rayleigh
  * wald = _rand.wald
  * triangular = _rand.triangular             # <<<<<<<<<<<<<<
@@ -20152,7 +20151,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__triangular, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4272
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4272
  * triangular = _rand.triangular
  * 
  * binomial = _rand.binomial             # <<<<<<<<<<<<<<
@@ -20167,7 +20166,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__binomial, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4272; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4273
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4273
  * 
  * binomial = _rand.binomial
  * negative_binomial = _rand.negative_binomial             # <<<<<<<<<<<<<<
@@ -20182,7 +20181,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__negative_binomial, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4274
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4274
  * binomial = _rand.binomial
  * negative_binomial = _rand.negative_binomial
  * poisson = _rand.poisson             # <<<<<<<<<<<<<<
@@ -20197,7 +20196,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__poisson, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4275
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4275
  * negative_binomial = _rand.negative_binomial
  * poisson = _rand.poisson
  * zipf = _rand.zipf             # <<<<<<<<<<<<<<
@@ -20212,7 +20211,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__zipf, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4276
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4276
  * poisson = _rand.poisson
  * zipf = _rand.zipf
  * geometric = _rand.geometric             # <<<<<<<<<<<<<<
@@ -20227,7 +20226,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__geometric, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4276; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4277
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4277
  * zipf = _rand.zipf
  * geometric = _rand.geometric
  * hypergeometric = _rand.hypergeometric             # <<<<<<<<<<<<<<
@@ -20242,7 +20241,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__hypergeometric, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4277; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4278
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4278
  * geometric = _rand.geometric
  * hypergeometric = _rand.hypergeometric
  * logseries = _rand.logseries             # <<<<<<<<<<<<<<
@@ -20257,7 +20256,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__logseries, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4280
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4280
  * logseries = _rand.logseries
  * 
  * multivariate_normal = _rand.multivariate_normal             # <<<<<<<<<<<<<<
@@ -20272,7 +20271,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__multivariate_normal, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4281
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4281
  * 
  * multivariate_normal = _rand.multivariate_normal
  * multinomial = _rand.multinomial             # <<<<<<<<<<<<<<
@@ -20287,7 +20286,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__multinomial, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4282
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4282
  * multivariate_normal = _rand.multivariate_normal
  * multinomial = _rand.multinomial
  * dirichlet = _rand.dirichlet             # <<<<<<<<<<<<<<
@@ -20302,7 +20301,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__dirichlet, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4282; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4284
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4284
  * dirichlet = _rand.dirichlet
  * 
  * shuffle = _rand.shuffle             # <<<<<<<<<<<<<<
@@ -20316,7 +20315,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__shuffle, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4284; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":4285
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4285
  * 
  * shuffle = _rand.shuffle
  * permutation = _rand.permutation             # <<<<<<<<<<<<<<
@@ -20329,7 +20328,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__permutation, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pauli/koodi/proj/scipy/numpy/numpy/random/mtrand/mtrand.pyx":1
+  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1
  * # mtrand.pyx -- A Pyrex wrapper of Jean-Sebastien Roy's RandomKit             # <<<<<<<<<<<<<<
  * #
  * # Copyright 2005 Robert Kern (robert.kern@gmail.com)
@@ -20962,7 +20961,7 @@
 }
 
 
-static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
+static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
     PyErr_Format(PyExc_ValueError,
         #if PY_VERSION_HEX < 0x02050000
                  "need more than %d value%s to unpack", (int)index,
@@ -20972,7 +20971,7 @@
                  (index == 1) ? "" : "s");
 }
 
-static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void) {
+static INLINE void __Pyx_RaiseTooManyValuesError(void) {
     PyErr_SetString(PyExc_ValueError, "too many values to unpack");
 }
 
@@ -21045,7 +21044,7 @@
 }
 
 
-static CYTHON_INLINE int __Pyx_CheckKeywordStrings(
+static INLINE int __Pyx_CheckKeywordStrings(
     PyObject *kwdict,
     const char* function_name,
     int kw_allowed)
@@ -21079,7 +21078,7 @@
     return 0;
 }
 
-static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
+static INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
     if (unlikely(!type)) {
         PyErr_Format(PyExc_SystemError, "Missing type object");
         return 0;
@@ -21092,7 +21091,7 @@
 }
 
 
-static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
+static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
     PyThreadState *tstate = PyThreadState_GET();
     *type = tstate->exc_type;
     *value = tstate->exc_value;
@@ -21157,7 +21156,7 @@
     return result;
 }
 
-static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
+static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
     PyObject *tmp_type, *tmp_value, *tmp_tb;
     PyThreadState *tstate = PyThreadState_GET();
 
@@ -21172,7 +21171,7 @@
     Py_XDECREF(tmp_tb);
 }
 
-static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
+static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
     PyThreadState *tstate = PyThreadState_GET();
     *type = tstate->curexc_type;
     *value = tstate->curexc_value;
@@ -21294,7 +21293,7 @@
 }
 #endif
 
-static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
+static INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
     const unsigned char neg_one = (unsigned char)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(unsigned char) < sizeof(long)) {
@@ -21313,7 +21312,7 @@
     return (unsigned char)__Pyx_PyInt_AsUnsignedLong(x);
 }
 
-static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
+static INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
     const unsigned short neg_one = (unsigned short)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(unsigned short) < sizeof(long)) {
@@ -21332,7 +21331,7 @@
     return (unsigned short)__Pyx_PyInt_AsUnsignedLong(x);
 }
 
-static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
+static INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
     const unsigned int neg_one = (unsigned int)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(unsigned int) < sizeof(long)) {
@@ -21351,7 +21350,7 @@
     return (unsigned int)__Pyx_PyInt_AsUnsignedLong(x);
 }
 
-static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
+static INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
     const char neg_one = (char)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(char) < sizeof(long)) {
@@ -21370,7 +21369,7 @@
     return (char)__Pyx_PyInt_AsLong(x);
 }
 
-static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
+static INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
     const short neg_one = (short)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(short) < sizeof(long)) {
@@ -21389,7 +21388,7 @@
     return (short)__Pyx_PyInt_AsLong(x);
 }
 
-static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
+static INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
     const int neg_one = (int)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(int) < sizeof(long)) {
@@ -21408,7 +21407,7 @@
     return (int)__Pyx_PyInt_AsLong(x);
 }
 
-static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
+static INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
     const signed char neg_one = (signed char)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(signed char) < sizeof(long)) {
@@ -21427,7 +21426,7 @@
     return (signed char)__Pyx_PyInt_AsSignedLong(x);
 }
 
-static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
+static INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
     const signed short neg_one = (signed short)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(signed short) < sizeof(long)) {
@@ -21446,7 +21445,7 @@
     return (signed short)__Pyx_PyInt_AsSignedLong(x);
 }
 
-static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
+static INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
     const signed int neg_one = (signed int)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(signed int) < sizeof(long)) {
@@ -21465,7 +21464,7 @@
     return (signed int)__Pyx_PyInt_AsSignedLong(x);
 }
 
-static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
+static INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
     const unsigned long neg_one = (unsigned long)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21500,7 +21499,7 @@
     }
 }
 
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
+static INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
     const unsigned PY_LONG_LONG neg_one = (unsigned PY_LONG_LONG)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21535,7 +21534,7 @@
     }
 }
 
-static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
+static INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
     const long neg_one = (long)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21570,7 +21569,7 @@
     }
 }
 
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
+static INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
     const PY_LONG_LONG neg_one = (PY_LONG_LONG)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21605,7 +21604,7 @@
     }
 }
 
-static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
+static INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
     const signed long neg_one = (signed long)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21640,7 +21639,7 @@
     }
 }
 
-static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
+static INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
     const signed PY_LONG_LONG neg_one = (signed PY_LONG_LONG)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21678,12 +21677,11 @@
 #ifndef __PYX_HAVE_RT_ImportType
 #define __PYX_HAVE_RT_ImportType
 static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name,
-    long size, int strict)
+    long size)
 {
     PyObject *py_module = 0;
     PyObject *result = 0;
     PyObject *py_name = 0;
-    char warning[200];
 
     py_module = __Pyx_ImportModule(module_name);
     if (!py_module)
@@ -21708,15 +21706,9 @@
             module_name, class_name);
         goto bad;
     }
-    if (!strict && ((PyTypeObject *)result)->tp_basicsize > size) {
-        PyOS_snprintf(warning, sizeof(warning), 
-            "%s.%s size changed, may indicate binary incompatibility",
-            module_name, class_name);
-        PyErr_WarnEx(NULL, warning, 0);
-    }
-    else if (((PyTypeObject *)result)->tp_basicsize != size) {
+    if (((PyTypeObject *)result)->tp_basicsize != size) {
         PyErr_Format(PyExc_ValueError, 
-            "%s.%s has the wrong size, try recompiling",
+            "%s.%s does not appear to be the correct type object",
             module_name, class_name);
         goto bad;
     }
@@ -21852,13 +21844,13 @@
 
 /* Type Conversion Functions */
 
-static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
+static INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
    if (x == Py_True) return 1;
    else if ((x == Py_False) | (x == Py_None)) return 0;
    else return PyObject_IsTrue(x);
 }
 
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
+static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
   PyNumberMethods *m;
   const char *name = NULL;
   PyObject *res = NULL;
@@ -21904,7 +21896,7 @@
   return res;
 }
 
-static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
+static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
   Py_ssize_t ival;
   PyObject* x = PyNumber_Index(b);
   if (!x) return -1;
@@ -21913,7 +21905,7 @@
   return ival;
 }
 
-static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
+static INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
 #if PY_VERSION_HEX < 0x02050000
    if (ival <= LONG_MAX)
        return PyInt_FromLong((long)ival);
@@ -21927,7 +21919,7 @@
 #endif
 }
 
-static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
+static INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
    unsigned PY_LONG_LONG val = __Pyx_PyInt_AsUnsignedLongLong(x);
    if (unlikely(val == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())) {
        return (size_t)-1;



More information about the Numpy-svn mailing list