Make Array init(randomCount:) faster

blmyself · Jan 21, 2017 · 8dc67b0 · 8dc67b0
1 parent 1635d9a
commit 8dc67b0
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/Sources/RandomKit/Extensions/Swift/Array+RandomKit.swift b/Sources/RandomKit/Extensions/Swift/Array+RandomKit.swift
@@ -31,7 +31,7 @@ extension Array where Element: Random {
     ///
     /// Although safety is not guaranteed, `init(unsafeRandomCount:)` is *significantly* faster than this.
     public init<R: RandomGenerator>(randomCount: Int, using randomGenerator: inout R) {
-        self = (0 ..< randomCount).map { _ in Element.random(using: &randomGenerator) }
+        self.init(Element.randoms(limitedBy: randomCount, using: &randomGenerator))
     }
 
 }
@@ -53,13 +53,7 @@ extension Array where Element: RandomWithinRange {
 
     /// Construct an Array of random elements from within the range.
     public init<R: RandomGenerator>(randomCount: Int, within range: Range<Element>, using randomGenerator: inout R) {
-        if range.isEmpty || randomCount <= 0 {
-            self = []
-        } else {
-            self = CountableRange(uncheckedBounds: (0, randomCount)).map { _ in
-                Element.random(within: range, using: &randomGenerator).unsafelyUnwrapped
-            }
-        }
+        self.init(Element.randoms(limitedBy: randomCount, within: range, using: &randomGenerator))
     }
 
 }
@@ -68,13 +62,7 @@ extension Array where Element: RandomWithinClosedRange {
 
     /// Construct an Array of random elements from within the closed range.
     public init<R: RandomGenerator>(randomCount: Int, within closedRange: ClosedRange<Element>, using randomGenerator: inout R) {
-        if randomCount <= 0 {
-            self = []
-        } else {
-            self = CountableRange(uncheckedBounds: (0, randomCount)).map { _ in
-                Element.random(within: closedRange, using: &randomGenerator)
-            }
-        }
+        self.init(Element.randoms(limitedBy: randomCount, within: closedRange, using: &randomGenerator))
     }
 
 }