diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
commit | f95a1b3c53bdd678b64aa608d4375660033460c3 (patch) | |
tree | a8bee40b1b14e28ff5978ea519f3035a3c399912 /Modules/_heapqmodule.c | |
parent | bd250300191133d276a71b395b6428081bf825b8 (diff) | |
download | cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.zip cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.gz cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.bz2 |
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
Diffstat (limited to 'Modules/_heapqmodule.c')
-rw-r--r-- | Modules/_heapqmodule.c | 890 |
1 files changed, 445 insertions, 445 deletions
diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c index 7921823..366fb3d 100644 --- a/Modules/_heapqmodule.c +++ b/Modules/_heapqmodule.c @@ -1,4 +1,4 @@ -/* Drop in replacement for heapq.py +/* Drop in replacement for heapq.py C implementation derived directly from heapq.py in Py2.3 which was written by Kevin O'Connor, augmented by Tim Peters, @@ -11,115 +11,115 @@ annotated by François Pinard, and converted to C by Raymond Hettinger. static int cmp_lt(PyObject *x, PyObject *y) { - return PyObject_RichCompareBool(x, y, Py_LT); + return PyObject_RichCompareBool(x, y, Py_LT); } static int _siftdown(PyListObject *heap, Py_ssize_t startpos, Py_ssize_t pos) { - PyObject *newitem, *parent; - int cmp; - Py_ssize_t parentpos; - - assert(PyList_Check(heap)); - if (pos >= PyList_GET_SIZE(heap)) { - PyErr_SetString(PyExc_IndexError, "index out of range"); - return -1; - } - - newitem = PyList_GET_ITEM(heap, pos); - Py_INCREF(newitem); - /* Follow the path to the root, moving parents down until finding - a place newitem fits. */ - while (pos > startpos){ - parentpos = (pos - 1) >> 1; - parent = PyList_GET_ITEM(heap, parentpos); - cmp = cmp_lt(newitem, parent); - if (cmp == -1) { - Py_DECREF(newitem); - return -1; - } - if (cmp == 0) - break; - Py_INCREF(parent); - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, parent); - pos = parentpos; - } - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, newitem); - return 0; + PyObject *newitem, *parent; + int cmp; + Py_ssize_t parentpos; + + assert(PyList_Check(heap)); + if (pos >= PyList_GET_SIZE(heap)) { + PyErr_SetString(PyExc_IndexError, "index out of range"); + return -1; + } + + newitem = PyList_GET_ITEM(heap, pos); + Py_INCREF(newitem); + /* Follow the path to the root, moving parents down until finding + a place newitem fits. */ + while (pos > startpos){ + parentpos = (pos - 1) >> 1; + parent = PyList_GET_ITEM(heap, parentpos); + cmp = cmp_lt(newitem, parent); + if (cmp == -1) { + Py_DECREF(newitem); + return -1; + } + if (cmp == 0) + break; + Py_INCREF(parent); + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, parent); + pos = parentpos; + } + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, newitem); + return 0; } static int _siftup(PyListObject *heap, Py_ssize_t pos) { - Py_ssize_t startpos, endpos, childpos, rightpos; - int cmp; - PyObject *newitem, *tmp; - - assert(PyList_Check(heap)); - endpos = PyList_GET_SIZE(heap); - startpos = pos; - if (pos >= endpos) { - PyErr_SetString(PyExc_IndexError, "index out of range"); - return -1; - } - newitem = PyList_GET_ITEM(heap, pos); - Py_INCREF(newitem); - - /* Bubble up the smaller child until hitting a leaf. */ - childpos = 2*pos + 1; /* leftmost child position */ - while (childpos < endpos) { - /* Set childpos to index of smaller child. */ - rightpos = childpos + 1; - if (rightpos < endpos) { - cmp = cmp_lt( - PyList_GET_ITEM(heap, childpos), - PyList_GET_ITEM(heap, rightpos)); - if (cmp == -1) { - Py_DECREF(newitem); - return -1; - } - if (cmp == 0) - childpos = rightpos; - } - /* Move the smaller child up. */ - tmp = PyList_GET_ITEM(heap, childpos); - Py_INCREF(tmp); - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, tmp); - pos = childpos; - childpos = 2*pos + 1; - } - - /* The leaf at pos is empty now. Put newitem there, and and bubble - it up to its final resting place (by sifting its parents down). */ - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, newitem); - return _siftdown(heap, startpos, pos); + Py_ssize_t startpos, endpos, childpos, rightpos; + int cmp; + PyObject *newitem, *tmp; + + assert(PyList_Check(heap)); + endpos = PyList_GET_SIZE(heap); + startpos = pos; + if (pos >= endpos) { + PyErr_SetString(PyExc_IndexError, "index out of range"); + return -1; + } + newitem = PyList_GET_ITEM(heap, pos); + Py_INCREF(newitem); + + /* Bubble up the smaller child until hitting a leaf. */ + childpos = 2*pos + 1; /* leftmost child position */ + while (childpos < endpos) { + /* Set childpos to index of smaller child. */ + rightpos = childpos + 1; + if (rightpos < endpos) { + cmp = cmp_lt( + PyList_GET_ITEM(heap, childpos), + PyList_GET_ITEM(heap, rightpos)); + if (cmp == -1) { + Py_DECREF(newitem); + return -1; + } + if (cmp == 0) + childpos = rightpos; + } + /* Move the smaller child up. */ + tmp = PyList_GET_ITEM(heap, childpos); + Py_INCREF(tmp); + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, tmp); + pos = childpos; + childpos = 2*pos + 1; + } + + /* The leaf at pos is empty now. Put newitem there, and and bubble + it up to its final resting place (by sifting its parents down). */ + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, newitem); + return _siftdown(heap, startpos, pos); } static PyObject * heappush(PyObject *self, PyObject *args) { - PyObject *heap, *item; + PyObject *heap, *item; - if (!PyArg_UnpackTuple(args, "heappush", 2, 2, &heap, &item)) - return NULL; + if (!PyArg_UnpackTuple(args, "heappush", 2, 2, &heap, &item)) + return NULL; - if (!PyList_Check(heap)) { - PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); - return NULL; - } + if (!PyList_Check(heap)) { + PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); + return NULL; + } - if (PyList_Append(heap, item) == -1) - return NULL; + if (PyList_Append(heap, item) == -1) + return NULL; - if (_siftdown((PyListObject *)heap, 0, PyList_GET_SIZE(heap)-1) == -1) - return NULL; - Py_INCREF(Py_None); - return Py_None; + if (_siftdown((PyListObject *)heap, 0, PyList_GET_SIZE(heap)-1) == -1) + return NULL; + Py_INCREF(Py_None); + return Py_None; } PyDoc_STRVAR(heappush_doc, @@ -128,35 +128,35 @@ PyDoc_STRVAR(heappush_doc, static PyObject * heappop(PyObject *self, PyObject *heap) { - PyObject *lastelt, *returnitem; - Py_ssize_t n; - - if (!PyList_Check(heap)) { - PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); - return NULL; - } - - /* # raises appropriate IndexError if heap is empty */ - n = PyList_GET_SIZE(heap); - if (n == 0) { - PyErr_SetString(PyExc_IndexError, "index out of range"); - return NULL; - } - - lastelt = PyList_GET_ITEM(heap, n-1) ; - Py_INCREF(lastelt); - PyList_SetSlice(heap, n-1, n, NULL); - n--; - - if (!n) - return lastelt; - returnitem = PyList_GET_ITEM(heap, 0); - PyList_SET_ITEM(heap, 0, lastelt); - if (_siftup((PyListObject *)heap, 0) == -1) { - Py_DECREF(returnitem); - return NULL; - } - return returnitem; + PyObject *lastelt, *returnitem; + Py_ssize_t n; + + if (!PyList_Check(heap)) { + PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); + return NULL; + } + + /* # raises appropriate IndexError if heap is empty */ + n = PyList_GET_SIZE(heap); + if (n == 0) { + PyErr_SetString(PyExc_IndexError, "index out of range"); + return NULL; + } + + lastelt = PyList_GET_ITEM(heap, n-1) ; + Py_INCREF(lastelt); + PyList_SetSlice(heap, n-1, n, NULL); + n--; + + if (!n) + return lastelt; + returnitem = PyList_GET_ITEM(heap, 0); + PyList_SET_ITEM(heap, 0, lastelt); + if (_siftup((PyListObject *)heap, 0) == -1) { + Py_DECREF(returnitem); + return NULL; + } + return returnitem; } PyDoc_STRVAR(heappop_doc, @@ -165,29 +165,29 @@ PyDoc_STRVAR(heappop_doc, static PyObject * heapreplace(PyObject *self, PyObject *args) { - PyObject *heap, *item, *returnitem; - - if (!PyArg_UnpackTuple(args, "heapreplace", 2, 2, &heap, &item)) - return NULL; - - if (!PyList_Check(heap)) { - PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); - return NULL; - } - - if (PyList_GET_SIZE(heap) < 1) { - PyErr_SetString(PyExc_IndexError, "index out of range"); - return NULL; - } - - returnitem = PyList_GET_ITEM(heap, 0); - Py_INCREF(item); - PyList_SET_ITEM(heap, 0, item); - if (_siftup((PyListObject *)heap, 0) == -1) { - Py_DECREF(returnitem); - return NULL; - } - return returnitem; + PyObject *heap, *item, *returnitem; + + if (!PyArg_UnpackTuple(args, "heapreplace", 2, 2, &heap, &item)) + return NULL; + + if (!PyList_Check(heap)) { + PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); + return NULL; + } + + if (PyList_GET_SIZE(heap) < 1) { + PyErr_SetString(PyExc_IndexError, "index out of range"); + return NULL; + } + + returnitem = PyList_GET_ITEM(heap, 0); + Py_INCREF(item); + PyList_SET_ITEM(heap, 0, item); + if (_siftup((PyListObject *)heap, 0) == -1) { + Py_DECREF(returnitem); + return NULL; + } + return returnitem; } PyDoc_STRVAR(heapreplace_doc, @@ -197,44 +197,44 @@ This is more efficient than heappop() followed by heappush(), and can be\n\ more appropriate when using a fixed-size heap. Note that the value\n\ returned may be larger than item! That constrains reasonable uses of\n\ this routine unless written as part of a conditional replacement:\n\n\ - if item > heap[0]:\n\ - item = heapreplace(heap, item)\n"); + if item > heap[0]:\n\ + item = heapreplace(heap, item)\n"); static PyObject * heappushpop(PyObject *self, PyObject *args) { - PyObject *heap, *item, *returnitem; - int cmp; - - if (!PyArg_UnpackTuple(args, "heappushpop", 2, 2, &heap, &item)) - return NULL; - - if (!PyList_Check(heap)) { - PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); - return NULL; - } - - if (PyList_GET_SIZE(heap) < 1) { - Py_INCREF(item); - return item; - } - - cmp = cmp_lt(PyList_GET_ITEM(heap, 0), item); - if (cmp == -1) - return NULL; - if (cmp == 0) { - Py_INCREF(item); - return item; - } - - returnitem = PyList_GET_ITEM(heap, 0); - Py_INCREF(item); - PyList_SET_ITEM(heap, 0, item); - if (_siftup((PyListObject *)heap, 0) == -1) { - Py_DECREF(returnitem); - return NULL; - } - return returnitem; + PyObject *heap, *item, *returnitem; + int cmp; + + if (!PyArg_UnpackTuple(args, "heappushpop", 2, 2, &heap, &item)) + return NULL; + + if (!PyList_Check(heap)) { + PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); + return NULL; + } + + if (PyList_GET_SIZE(heap) < 1) { + Py_INCREF(item); + return item; + } + + cmp = cmp_lt(PyList_GET_ITEM(heap, 0), item); + if (cmp == -1) + return NULL; + if (cmp == 0) { + Py_INCREF(item); + return item; + } + + returnitem = PyList_GET_ITEM(heap, 0); + Py_INCREF(item); + PyList_SET_ITEM(heap, 0, item); + if (_siftup((PyListObject *)heap, 0) == -1) { + Py_DECREF(returnitem); + return NULL; + } + return returnitem; } PyDoc_STRVAR(heappushpop_doc, @@ -245,26 +245,26 @@ heappush() followed by a separate call to heappop()."); static PyObject * heapify(PyObject *self, PyObject *heap) { - Py_ssize_t i, n; - - if (!PyList_Check(heap)) { - PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); - return NULL; - } - - n = PyList_GET_SIZE(heap); - /* Transform bottom-up. The largest index there's any point to - looking at is the largest with a child index in-range, so must - have 2*i + 1 < n, or i < (n-1)/2. If n is even = 2*j, this is - (2*j-1)/2 = j-1/2 so j-1 is the largest, which is n//2 - 1. If - n is odd = 2*j+1, this is (2*j+1-1)/2 = j so j-1 is the largest, - and that's again n//2-1. - */ - for (i=n/2-1 ; i>=0 ; i--) - if(_siftup((PyListObject *)heap, i) == -1) - return NULL; - Py_INCREF(Py_None); - return Py_None; + Py_ssize_t i, n; + + if (!PyList_Check(heap)) { + PyErr_SetString(PyExc_TypeError, "heap argument must be a list"); + return NULL; + } + + n = PyList_GET_SIZE(heap); + /* Transform bottom-up. The largest index there's any point to + looking at is the largest with a child index in-range, so must + have 2*i + 1 < n, or i < (n-1)/2. If n is even = 2*j, this is + (2*j-1)/2 = j-1/2 so j-1 is the largest, which is n//2 - 1. If + n is odd = 2*j+1, this is (2*j+1-1)/2 = j so j-1 is the largest, + and that's again n//2-1. + */ + for (i=n/2-1 ; i>=0 ; i--) + if(_siftup((PyListObject *)heap, i) == -1) + return NULL; + Py_INCREF(Py_None); + return Py_None; } PyDoc_STRVAR(heapify_doc, @@ -273,79 +273,79 @@ PyDoc_STRVAR(heapify_doc, static PyObject * nlargest(PyObject *self, PyObject *args) { - PyObject *heap=NULL, *elem, *iterable, *sol, *it, *oldelem; - Py_ssize_t i, n; - int cmp; - - if (!PyArg_ParseTuple(args, "nO:nlargest", &n, &iterable)) - return NULL; - - it = PyObject_GetIter(iterable); - if (it == NULL) - return NULL; - - heap = PyList_New(0); - if (heap == NULL) - goto fail; - - for (i=0 ; i<n ; i++ ){ - elem = PyIter_Next(it); - if (elem == NULL) { - if (PyErr_Occurred()) - goto fail; - else - goto sortit; - } - if (PyList_Append(heap, elem) == -1) { - Py_DECREF(elem); - goto fail; - } - Py_DECREF(elem); - } - if (PyList_GET_SIZE(heap) == 0) - goto sortit; - - for (i=n/2-1 ; i>=0 ; i--) - if(_siftup((PyListObject *)heap, i) == -1) - goto fail; - - sol = PyList_GET_ITEM(heap, 0); - while (1) { - elem = PyIter_Next(it); - if (elem == NULL) { - if (PyErr_Occurred()) - goto fail; - else - goto sortit; - } - cmp = cmp_lt(sol, elem); - if (cmp == -1) { - Py_DECREF(elem); - goto fail; - } - if (cmp == 0) { - Py_DECREF(elem); - continue; - } - oldelem = PyList_GET_ITEM(heap, 0); - PyList_SET_ITEM(heap, 0, elem); - Py_DECREF(oldelem); - if (_siftup((PyListObject *)heap, 0) == -1) - goto fail; - sol = PyList_GET_ITEM(heap, 0); - } + PyObject *heap=NULL, *elem, *iterable, *sol, *it, *oldelem; + Py_ssize_t i, n; + int cmp; + + if (!PyArg_ParseTuple(args, "nO:nlargest", &n, &iterable)) + return NULL; + + it = PyObject_GetIter(iterable); + if (it == NULL) + return NULL; + + heap = PyList_New(0); + if (heap == NULL) + goto fail; + + for (i=0 ; i<n ; i++ ){ + elem = PyIter_Next(it); + if (elem == NULL) { + if (PyErr_Occurred()) + goto fail; + else + goto sortit; + } + if (PyList_Append(heap, elem) == -1) { + Py_DECREF(elem); + goto fail; + } + Py_DECREF(elem); + } + if (PyList_GET_SIZE(heap) == 0) + goto sortit; + + for (i=n/2-1 ; i>=0 ; i--) + if(_siftup((PyListObject *)heap, i) == -1) + goto fail; + + sol = PyList_GET_ITEM(heap, 0); + while (1) { + elem = PyIter_Next(it); + if (elem == NULL) { + if (PyErr_Occurred()) + goto fail; + else + goto sortit; + } + cmp = cmp_lt(sol, elem); + if (cmp == -1) { + Py_DECREF(elem); + goto fail; + } + if (cmp == 0) { + Py_DECREF(elem); + continue; + } + oldelem = PyList_GET_ITEM(heap, 0); + PyList_SET_ITEM(heap, 0, elem); + Py_DECREF(oldelem); + if (_siftup((PyListObject *)heap, 0) == -1) + goto fail; + sol = PyList_GET_ITEM(heap, 0); + } sortit: - if (PyList_Sort(heap) == -1) - goto fail; - if (PyList_Reverse(heap) == -1) - goto fail; - Py_DECREF(it); - return heap; + if (PyList_Sort(heap) == -1) + goto fail; + if (PyList_Reverse(heap) == -1) + goto fail; + Py_DECREF(it); + return heap; fail: - Py_DECREF(it); - Py_XDECREF(heap); - return NULL; + Py_DECREF(it); + Py_XDECREF(heap); + return NULL; } PyDoc_STRVAR(nlargest_doc, @@ -356,166 +356,166 @@ Equivalent to: sorted(iterable, reverse=True)[:n]\n"); static int _siftdownmax(PyListObject *heap, Py_ssize_t startpos, Py_ssize_t pos) { - PyObject *newitem, *parent; - int cmp; - Py_ssize_t parentpos; - - assert(PyList_Check(heap)); - if (pos >= PyList_GET_SIZE(heap)) { - PyErr_SetString(PyExc_IndexError, "index out of range"); - return -1; - } - - newitem = PyList_GET_ITEM(heap, pos); - Py_INCREF(newitem); - /* Follow the path to the root, moving parents down until finding - a place newitem fits. */ - while (pos > startpos){ - parentpos = (pos - 1) >> 1; - parent = PyList_GET_ITEM(heap, parentpos); - cmp = cmp_lt(parent, newitem); - if (cmp == -1) { - Py_DECREF(newitem); - return -1; - } - if (cmp == 0) - break; - Py_INCREF(parent); - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, parent); - pos = parentpos; - } - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, newitem); - return 0; + PyObject *newitem, *parent; + int cmp; + Py_ssize_t parentpos; + + assert(PyList_Check(heap)); + if (pos >= PyList_GET_SIZE(heap)) { + PyErr_SetString(PyExc_IndexError, "index out of range"); + return -1; + } + + newitem = PyList_GET_ITEM(heap, pos); + Py_INCREF(newitem); + /* Follow the path to the root, moving parents down until finding + a place newitem fits. */ + while (pos > startpos){ + parentpos = (pos - 1) >> 1; + parent = PyList_GET_ITEM(heap, parentpos); + cmp = cmp_lt(parent, newitem); + if (cmp == -1) { + Py_DECREF(newitem); + return -1; + } + if (cmp == 0) + break; + Py_INCREF(parent); + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, parent); + pos = parentpos; + } + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, newitem); + return 0; } static int _siftupmax(PyListObject *heap, Py_ssize_t pos) { - Py_ssize_t startpos, endpos, childpos, rightpos; - int cmp; - PyObject *newitem, *tmp; - - assert(PyList_Check(heap)); - endpos = PyList_GET_SIZE(heap); - startpos = pos; - if (pos >= endpos) { - PyErr_SetString(PyExc_IndexError, "index out of range"); - return -1; - } - newitem = PyList_GET_ITEM(heap, pos); - Py_INCREF(newitem); - - /* Bubble up the smaller child until hitting a leaf. */ - childpos = 2*pos + 1; /* leftmost child position */ - while (childpos < endpos) { - /* Set childpos to index of smaller child. */ - rightpos = childpos + 1; - if (rightpos < endpos) { - cmp = cmp_lt( - PyList_GET_ITEM(heap, rightpos), - PyList_GET_ITEM(heap, childpos)); - if (cmp == -1) { - Py_DECREF(newitem); - return -1; - } - if (cmp == 0) - childpos = rightpos; - } - /* Move the smaller child up. */ - tmp = PyList_GET_ITEM(heap, childpos); - Py_INCREF(tmp); - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, tmp); - pos = childpos; - childpos = 2*pos + 1; - } - - /* The leaf at pos is empty now. Put newitem there, and and bubble - it up to its final resting place (by sifting its parents down). */ - Py_DECREF(PyList_GET_ITEM(heap, pos)); - PyList_SET_ITEM(heap, pos, newitem); - return _siftdownmax(heap, startpos, pos); + Py_ssize_t startpos, endpos, childpos, rightpos; + int cmp; + PyObject *newitem, *tmp; + + assert(PyList_Check(heap)); + endpos = PyList_GET_SIZE(heap); + startpos = pos; + if (pos >= endpos) { + PyErr_SetString(PyExc_IndexError, "index out of range"); + return -1; + } + newitem = PyList_GET_ITEM(heap, pos); + Py_INCREF(newitem); + + /* Bubble up the smaller child until hitting a leaf. */ + childpos = 2*pos + 1; /* leftmost child position */ + while (childpos < endpos) { + /* Set childpos to index of smaller child. */ + rightpos = childpos + 1; + if (rightpos < endpos) { + cmp = cmp_lt( + PyList_GET_ITEM(heap, rightpos), + PyList_GET_ITEM(heap, childpos)); + if (cmp == -1) { + Py_DECREF(newitem); + return -1; + } + if (cmp == 0) + childpos = rightpos; + } + /* Move the smaller child up. */ + tmp = PyList_GET_ITEM(heap, childpos); + Py_INCREF(tmp); + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, tmp); + pos = childpos; + childpos = 2*pos + 1; + } + + /* The leaf at pos is empty now. Put newitem there, and and bubble + it up to its final resting place (by sifting its parents down). */ + Py_DECREF(PyList_GET_ITEM(heap, pos)); + PyList_SET_ITEM(heap, pos, newitem); + return _siftdownmax(heap, startpos, pos); } static PyObject * nsmallest(PyObject *self, PyObject *args) { - PyObject *heap=NULL, *elem, *iterable, *los, *it, *oldelem; - Py_ssize_t i, n; - int cmp; - - if (!PyArg_ParseTuple(args, "nO:nsmallest", &n, &iterable)) - return NULL; - - it = PyObject_GetIter(iterable); - if (it == NULL) - return NULL; - - heap = PyList_New(0); - if (heap == NULL) - goto fail; - - for (i=0 ; i<n ; i++ ){ - elem = PyIter_Next(it); - if (elem == NULL) { - if (PyErr_Occurred()) - goto fail; - else - goto sortit; - } - if (PyList_Append(heap, elem) == -1) { - Py_DECREF(elem); - goto fail; - } - Py_DECREF(elem); - } - n = PyList_GET_SIZE(heap); - if (n == 0) - goto sortit; - - for (i=n/2-1 ; i>=0 ; i--) - if(_siftupmax((PyListObject *)heap, i) == -1) - goto fail; - - los = PyList_GET_ITEM(heap, 0); - while (1) { - elem = PyIter_Next(it); - if (elem == NULL) { - if (PyErr_Occurred()) - goto fail; - else - goto sortit; - } - cmp = cmp_lt(elem, los); - if (cmp == -1) { - Py_DECREF(elem); - goto fail; - } - if (cmp == 0) { - Py_DECREF(elem); - continue; - } - - oldelem = PyList_GET_ITEM(heap, 0); - PyList_SET_ITEM(heap, 0, elem); - Py_DECREF(oldelem); - if (_siftupmax((PyListObject *)heap, 0) == -1) - goto fail; - los = PyList_GET_ITEM(heap, 0); - } + PyObject *heap=NULL, *elem, *iterable, *los, *it, *oldelem; + Py_ssize_t i, n; + int cmp; + + if (!PyArg_ParseTuple(args, "nO:nsmallest", &n, &iterable)) + return NULL; + + it = PyObject_GetIter(iterable); + if (it == NULL) + return NULL; + + heap = PyList_New(0); + if (heap == NULL) + goto fail; + + for (i=0 ; i<n ; i++ ){ + elem = PyIter_Next(it); + if (elem == NULL) { + if (PyErr_Occurred()) + goto fail; + else + goto sortit; + } + if (PyList_Append(heap, elem) == -1) { + Py_DECREF(elem); + goto fail; + } + Py_DECREF(elem); + } + n = PyList_GET_SIZE(heap); + if (n == 0) + goto sortit; + + for (i=n/2-1 ; i>=0 ; i--) + if(_siftupmax((PyListObject *)heap, i) == -1) + goto fail; + + los = PyList_GET_ITEM(heap, 0); + while (1) { + elem = PyIter_Next(it); + if (elem == NULL) { + if (PyErr_Occurred()) + goto fail; + else + goto sortit; + } + cmp = cmp_lt(elem, los); + if (cmp == -1) { + Py_DECREF(elem); + goto fail; + } + if (cmp == 0) { + Py_DECREF(elem); + continue; + } + + oldelem = PyList_GET_ITEM(heap, 0); + PyList_SET_ITEM(heap, 0, elem); + Py_DECREF(oldelem); + if (_siftupmax((PyListObject *)heap, 0) == -1) + goto fail; + los = PyList_GET_ITEM(heap, 0); + } sortit: - if (PyList_Sort(heap) == -1) - goto fail; - Py_DECREF(it); - return heap; + if (PyList_Sort(heap) == -1) + goto fail; + Py_DECREF(it); + return heap; fail: - Py_DECREF(it); - Py_XDECREF(heap); - return NULL; + Py_DECREF(it); + Py_XDECREF(heap); + return NULL; } PyDoc_STRVAR(nsmallest_doc, @@ -524,21 +524,21 @@ PyDoc_STRVAR(nsmallest_doc, Equivalent to: sorted(iterable)[:n]\n"); static PyMethodDef heapq_methods[] = { - {"heappush", (PyCFunction)heappush, - METH_VARARGS, heappush_doc}, - {"heappushpop", (PyCFunction)heappushpop, - METH_VARARGS, heappushpop_doc}, - {"heappop", (PyCFunction)heappop, - METH_O, heappop_doc}, - {"heapreplace", (PyCFunction)heapreplace, - METH_VARARGS, heapreplace_doc}, - {"heapify", (PyCFunction)heapify, - METH_O, heapify_doc}, - {"nlargest", (PyCFunction)nlargest, - METH_VARARGS, nlargest_doc}, - {"nsmallest", (PyCFunction)nsmallest, - METH_VARARGS, nsmallest_doc}, - {NULL, NULL} /* sentinel */ + {"heappush", (PyCFunction)heappush, + METH_VARARGS, heappush_doc}, + {"heappushpop", (PyCFunction)heappushpop, + METH_VARARGS, heappushpop_doc}, + {"heappop", (PyCFunction)heappop, + METH_O, heappop_doc}, + {"heapreplace", (PyCFunction)heapreplace, + METH_VARARGS, heapreplace_doc}, + {"heapify", (PyCFunction)heapify, + METH_O, heapify_doc}, + {"nlargest", (PyCFunction)nlargest, + METH_VARARGS, nlargest_doc}, + {"nsmallest", (PyCFunction)nsmallest, + METH_VARARGS, nsmallest_doc}, + {NULL, NULL} /* sentinel */ }; PyDoc_STRVAR(module_doc, @@ -668,27 +668,27 @@ From all times, sorting has always been a Great Art! :-)\n"); static struct PyModuleDef _heapqmodule = { - PyModuleDef_HEAD_INIT, - "_heapq", - module_doc, - -1, - heapq_methods, - NULL, - NULL, - NULL, - NULL + PyModuleDef_HEAD_INIT, + "_heapq", + module_doc, + -1, + heapq_methods, + NULL, + NULL, + NULL, + NULL }; PyMODINIT_FUNC PyInit__heapq(void) { - PyObject *m, *about; - - m = PyModule_Create(&_heapqmodule); - if (m == NULL) - return NULL; - about = PyUnicode_DecodeUTF8(__about__, strlen(__about__), NULL); - PyModule_AddObject(m, "__about__", about); - return m; + PyObject *m, *about; + + m = PyModule_Create(&_heapqmodule); + if (m == NULL) + return NULL; + about = PyUnicode_DecodeUTF8(__about__, strlen(__about__), NULL); + PyModule_AddObject(m, "__about__", about); + return m; } |