Changeset 4972

Timestamp:

10/18/07 21:16:28 (9 months ago)

Author:

morris

Message:

Add -shuffle, -shuffledArray

Files:

• WiredAdditions/trunk/NSArray-WIAdditions.h (modified) (2 diffs)
• WiredAdditions/trunk/NSArray-WIAdditions.m (modified) (2 diffs)

WiredAdditions/trunk/NSArray-WIAdditions.h

@@ -42 +42 @@
-- (NSArray *)subarrayFromIndex:(NSUInteger)index;
-- (NSArray *)reversedArray;
+- (NSArray *)shuffledArray;
-
-- (NSNumber *)minimumNumber;
@@ -53 +54 @@
-- (void)moveObjectAtIndex:(NSUInteger)from toIndex:(NSUInteger)to;
-- (void)reverse;
+- (void)shuffle;
-
-@end

WiredAdditions/trunk/NSArray-WIAdditions.m

@@ -167 +167 @@
-
-
+- (NSArray *)shuffledArray {
+        NSMutableArray          *array;
+        NSUInteger                      i, count;
+        
+        array = [self mutableCopy];
+        count = [array count];
+        
+        for(i = 0; i < count; i++)
+                [array moveObjectAtIndex:i toIndex:random() % count];
+        
+        return [array autorelease];
+}
+
+
+
-#pragma mark -
-
@@ -254 +269 @@
-}
-
+
+
+- (void)shuffle {
+        [self setArray:[self shuffledArray]];
+}
+
-@end