colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-03 07:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Marginally faster filter and sort in CPArrayController's arrangeObjects (4% in the performance tester.) Reduced memory usage when both a filter and a sort order are applied. Cleanup of the tester and a filter only test run.

Browse Source
This commit is contained in:
Alexander Ljungberg
2010-08-09 17:31:36 -04:00
parent 998c2f19cf
commit 271bb00147
3 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/AppKit/CPArrayControllerPerformance.j
+34 -12
View File
@@ -7,11 +7,12 @@
- (void)testRearrangeObjects
{
var ELEMENTS = 200,
REPEATS = 50,
REPEATS = 25,
ac = [CPArrayController new],
array = [];
for (var i=0; i<ELEMENTS; i++) {
for (var i = 0; i < ELEMENTS; i++)
{
var s = [Sortable new];
[s setA:i];
[s setB:i % 3];
@@ -24,12 +25,12 @@
[ac setContent:array];
[ac setFilterPredicate:[CPPredicate predicateWithFormat:@"(b != %@)", 0]];
// Filter alone
var start = (new Date).getTime();
[ac setSortDescriptors:descriptors];
[ac setFilterPredicate:[CPPredicate predicateWithFormat:@"(b !=%@)", 0]];
for (var i=0; i<REPEATS; i++)
for (var i = 0; i < REPEATS; i++)
{
[ac rearrangeObjects];
@@ -37,7 +38,30 @@
last = ELEMENTS;
// Verify that all is well.
for (var j=0, count=[sorted count]; j<count; j++)
for (var j = 0, count = [sorted count]; j < count; j++)
{
if (sorted[j].b == 0)
[self fail:"b == 0 should be filtered out (position: "+j+")"];
last = sorted[j];
}
}
var end = (new Date).getTime();
CPLog.warn("testRearrangeObjects, filter: "+(end-start)+"ms");
[ac setSortDescriptors:descriptors];
// Filter and sort.
start = (new Date).getTime();
for (var i = 0; i < REPEATS; i++)
{
[ac rearrangeObjects];
var sorted = [ac arrangedObjects],
last = ELEMENTS;
// Verify that all is well.
for (var j = 0, count = [sorted count]; j < count; j++)
{
if (sorted[j].b == 0)
[self fail:"b == 0 should be filtered out (position: "+j+")"];
@@ -46,11 +70,9 @@
last = sorted[j];
}
}
end = (new Date).getTime();
var end = (new Date).getTime();
CPLog.warn("testRearrangeObjects: "+(end-start)+"ms");
CPLog.warn("testRearrangeObjects, filter and sort: "+(end-start)+"ms");
}
@end