More capp_linting.

Reviewed by me.
This commit is contained in:
Francisco Ryan Tolmasky I
2010-12-09 13:45:29 -08:00
parent 3cda75986b
commit d69f46f7ee
32 changed files with 305 additions and 287 deletions
+27 -13
View File
@@ -3,6 +3,7 @@
@import <Foundation/CPNumber.j>
@import <Foundation/CPSortDescriptor.j>
var ELEMENTS = 100,
REPEATS = 10;
@@ -19,15 +20,16 @@ var ELEMENTS = 100,
var start = (new Date).getTime();
for (var i=0; i<REPEATS; i++)
for (var i = 0; i < REPEATS; ++i)
{
var sorted = [array sortedArrayUsingDescriptors:descriptors];
[self checkSorted:sorted];
}
var end = (new Date).getTime();
CPLog.warn(_cmd+": "+(end-start)+"ms");
CPLog.warn(_cmd + ": " + (end - start) + "ms");
}
- (void)testSortUsingNativeSort
@@ -38,47 +40,59 @@ var ELEMENTS = 100,
[CPSortDescriptor sortDescriptorWithKey:"a" ascending:NO],
[CPSortDescriptor sortDescriptorWithKey:"b" ascending:YES]
];
function sortFunction(lhs, rhs) {
function sortFunction(lhs, rhs)
{
return ([lhs a] === [rhs a]) ? ([lhs b] - [rhs b]) : ([rhs a] - [lhs a]);
}
var start = (new Date).getTime();
for (var i=0; i<REPEATS; i++)
for (var i = 0; i < REPEATS; ++i)
{
var sorted = [array copy];
sorted.sort(sortFunction)
[self checkSorted:sorted];
}
var end = (new Date).getTime();
CPLog.warn(_cmd+": "+(end-start)+"ms");
CPLog.warn(_cmd+": " + (end - start) + "ms");
}
- (CPArray)makeUnsorted
{
var array = [];
for (var i=0; i<ELEMENTS; i++) {
for (var i=0; i < ELEMENTS; ++i)
{
var s = [Sortable new];
[s setA:(i % 5)];
[s setB:(ELEMENTS-i)];
[s setB:(ELEMENTS - i)];
array.push(s);
}
return array;
}
- (void)checkSorted:(CPArray)sorted
{
// Verify it really got sorted.
for (var j=0; j<ELEMENTS; j++) {
for (var j=0; j < ELEMENTS; ++j)
{
var expectedA = 4-FLOOR(j * 5 / ELEMENTS);
if (sorted[j].a != expectedA)
[self fail:"a out of order: "+expectedA+" != "+sorted[j].a];
var expectedB = (5-expectedA) + 5 * (j % (ELEMENTS / 5))
[self fail:"a out of order: " + expectedA + " != " + sorted[j].a];
var expectedB = (5 - expectedA) + 5 * (j % (ELEMENTS / 5));
if (sorted[j].b != expectedB)
[self fail:"b out of order: "+expectedB+" != "+sorted[j].b];
[self fail:"b out of order: " + expectedB + " != " + sorted[j].b];
}
}
@@ -90,4 +104,4 @@ var ELEMENTS = 100,
int b @accessors;
}
@end
@end