Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimized ( Rect/Frect ) unionall()/unionall_ip() #2784

Merged
merged 2 commits into from
May 11, 2024
Merged

Optimized ( Rect/Frect ) unionall()/unionall_ip() #2784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1511ef4
made unionall/unionall_ip METH_O and optimized looping
itzpr3d4t0r Mar 31, 2024
92f27a3
swapped PySequence_GetItem with faster alternative
itzpr3d4t0r Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src_c/rect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,7 @@ static struct PyMethodDef pg_rect_methods[] = {
{"update", (PyCFunction)pg_rect_update, METH_FASTCALL, DOC_RECT_UPDATE},
{"inflate", (PyCFunction)pg_rect_inflate, METH_VARARGS, DOC_RECT_INFLATE},
{"union", (PyCFunction)pg_rect_union, METH_FASTCALL, DOC_RECT_UNION},
{"unionall", (PyCFunction)pg_rect_unionall, METH_VARARGS,
DOC_RECT_UNIONALL},
{"unionall", (PyCFunction)pg_rect_unionall, METH_O, DOC_RECT_UNIONALL},
{"move_ip", (PyCFunction)pg_rect_move_ip, METH_FASTCALL, DOC_RECT_MOVEIP},
{"move_to", (PyCFunction)pg_rect_move_to, METH_FASTCALL | METH_KEYWORDS,
DOC_RECT_MOVETO},
Expand All @@ -482,7 +481,7 @@ static struct PyMethodDef pg_rect_methods[] = {
METH_VARARGS | METH_KEYWORDS, DOC_RECT_SCALEBYIP},
{"union_ip", (PyCFunction)pg_rect_union_ip, METH_FASTCALL,
DOC_RECT_UNIONIP},
{"unionall_ip", (PyCFunction)pg_rect_unionall_ip, METH_VARARGS,
{"unionall_ip", (PyCFunction)pg_rect_unionall_ip, METH_O,
DOC_RECT_UNIONALLIP},
{"collidepoint", (PyCFunction)pg_rect_collidepoint, METH_FASTCALL,
DOC_RECT_COLLIDEPOINT},
Expand Down Expand Up @@ -521,8 +520,7 @@ static struct PyMethodDef pg_frect_methods[] = {
{"update", (PyCFunction)pg_frect_update, METH_FASTCALL, DOC_RECT_UPDATE},
{"inflate", (PyCFunction)pg_frect_inflate, METH_VARARGS, DOC_RECT_INFLATE},
{"union", (PyCFunction)pg_frect_union, METH_FASTCALL, DOC_RECT_UNION},
{"unionall", (PyCFunction)pg_frect_unionall, METH_VARARGS,
DOC_RECT_UNIONALL},
{"unionall", (PyCFunction)pg_frect_unionall, METH_O, DOC_RECT_UNIONALL},
{"move_ip", (PyCFunction)pg_frect_move_ip, METH_FASTCALL, DOC_RECT_MOVEIP},
{"move_to", (PyCFunction)pg_frect_move_to, METH_FASTCALL | METH_KEYWORDS,
DOC_RECT_MOVETO},
Expand All @@ -534,7 +532,7 @@ static struct PyMethodDef pg_frect_methods[] = {
METH_VARARGS | METH_KEYWORDS, DOC_RECT_SCALEBYIP},
{"union_ip", (PyCFunction)pg_frect_union_ip, METH_FASTCALL,
DOC_RECT_UNIONIP},
{"unionall_ip", (PyCFunction)pg_frect_unionall_ip, METH_VARARGS,
{"unionall_ip", (PyCFunction)pg_frect_unionall_ip, METH_O,
DOC_RECT_UNIONALLIP},
{"collidepoint", (PyCFunction)pg_frect_collidepoint, METH_FASTCALL,
DOC_RECT_COLLIDEPOINT},
Expand Down
141 changes: 93 additions & 48 deletions src_c/rect_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,17 +1164,14 @@ RectExport_unionIp(RectObject *self, PyObject *const *args, Py_ssize_t nargs)
}

static PyObject *
RectExport_unionall(RectObject *self, PyObject *args)
RectExport_unionall(RectObject *self, PyObject *arg)
{
InnerRect *argrect, temp;
Py_ssize_t loop, size;
PyObject *list, *obj;
PyObject *obj;
PrimitiveType t, l, b, r;

if (!PyArg_ParseTuple(args, "O", &list)) {
return NULL;
}
if (!PySequence_Check(list)) {
if (!PySequence_Check(arg)) {
return RAISE(PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
}
Expand All @@ -1183,44 +1180,67 @@ RectExport_unionall(RectObject *self, PyObject *args)
t = self->r.y;
r = self->r.x + self->r.w;
b = self->r.y + self->r.h;
size = PySequence_Length(list); /*warning, size could be -1 on error?*/
if (size < 1) {
if (size < 0) {
/*Error.*/
return NULL;

if (pgSequenceFast_Check(arg)) {
PyObject **items = PySequence_Fast_ITEMS(arg);
size = PySequence_Fast_GET_SIZE(arg);

if (size < 1) {
/*Empty arg: nothing to be done.*/
return RectExport_subtypeNew4(Py_TYPE(self), l, t, r - l, b - t);
}

for (loop = 0; loop < size; ++loop) {
if (!(argrect = RectFromObject(items[loop], &temp))) {
return RAISE(
PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
}
l = MIN(l, argrect->x);
t = MIN(t, argrect->y);
r = MAX(r, argrect->x + argrect->w);
b = MAX(b, argrect->y + argrect->h);
}
/*Empty list: nothing to be done.*/
return RectExport_subtypeNew4(Py_TYPE(self), l, t, r - l, b - t);
}
else {
size = PySequence_Length(arg); /*warning, size could be -1 on error?*/
if (size < 1) {
if (size < 0) {
/*Error.*/
return NULL;
}
/*Empty arg: nothing to be done.*/
return RectExport_subtypeNew4(Py_TYPE(self), l, t, r - l, b - t);
}

for (loop = 0; loop < size; ++loop) {
obj = PySequence_GetItem(list, loop);
if (!obj || !(argrect = RectFromObject(obj, &temp))) {
Py_XDECREF(obj);
return RAISE(PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
for (loop = 0; loop < size; ++loop) {
obj = PySequence_ITEM(arg, loop);
if (!obj || !(argrect = RectFromObject(obj, &temp))) {
Py_XDECREF(obj);
return RAISE(
PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
}
l = MIN(l, argrect->x);
t = MIN(t, argrect->y);
r = MAX(r, argrect->x + argrect->w);
b = MAX(b, argrect->y + argrect->h);
Py_DECREF(obj);
}
l = MIN(l, argrect->x);
t = MIN(t, argrect->y);
r = MAX(r, argrect->x + argrect->w);
b = MAX(b, argrect->y + argrect->h);
Py_DECREF(obj);
}

return RectExport_subtypeNew4(Py_TYPE(self), l, t, r - l, b - t);
}

static PyObject *
RectExport_unionallIp(RectObject *self, PyObject *args)
RectExport_unionallIp(RectObject *self, PyObject *arg)
{
InnerRect *argrect, temp;
Py_ssize_t loop, size;
PyObject *list, *obj;
PyObject *obj;
PrimitiveType t, l, b, r;

if (!PyArg_ParseTuple(args, "O", &list)) {
return NULL;
}
if (!PySequence_Check(list)) {
if (!PySequence_Check(arg)) {
return RAISE(PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
}
Expand All @@ -1230,34 +1250,59 @@ RectExport_unionallIp(RectObject *self, PyObject *args)
r = self->r.x + self->r.w;
b = self->r.y + self->r.h;

size = PySequence_Length(list); /*warning, size could be -1 on error?*/
if (size < 1) {
if (size < 0) {
/*Error.*/
return NULL;
if (pgSequenceFast_Check(arg)) {
PyObject **items = PySequence_Fast_ITEMS(arg);
size = PySequence_Fast_GET_SIZE(arg);

if (size < 1) {
/*Empty arg: nothing to be done.*/
Py_RETURN_NONE;
}

for (loop = 0; loop < size; ++loop) {
if (!(argrect = RectFromObject(items[loop], &temp))) {
return RAISE(
PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
}
l = MIN(l, argrect->x);
t = MIN(t, argrect->y);
r = MAX(r, argrect->x + argrect->w);
b = MAX(b, argrect->y + argrect->h);
}
/*Empty list: nothing to be done.*/
Py_RETURN_NONE;
}
else {
size = PySequence_Length(arg); /*warning, size could be -1 on error?*/
if (size < 1) {
if (size < 0) {
/*Error.*/
return NULL;
}
/*Empty arg: nothing to be done.*/
Py_RETURN_NONE;
}

for (loop = 0; loop < size; ++loop) {
obj = PySequence_GetItem(list, loop);
if (!obj || !(argrect = RectFromObject(obj, &temp))) {
Py_XDECREF(obj);
return RAISE(PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
for (loop = 0; loop < size; ++loop) {
obj = PySequence_ITEM(arg, loop);
if (!obj || !(argrect = RectFromObject(obj, &temp))) {
Py_XDECREF(obj);
return RAISE(
PyExc_TypeError,
"Argument must be a sequence of rectstyle objects.");
}
l = MIN(l, argrect->x);
t = MIN(t, argrect->y);
r = MAX(r, argrect->x + argrect->w);
b = MAX(b, argrect->y + argrect->h);
Py_DECREF(obj);
}
l = MIN(l, argrect->x);
t = MIN(t, argrect->y);
r = MAX(r, argrect->x + argrect->w);
b = MAX(b, argrect->y + argrect->h);
Py_DECREF(obj);
}

self->r.x = l;
self->r.y = t;
self->r.w = r - l;
self->r.h = b - t;

Py_RETURN_NONE;
}

Expand Down
Loading