Skip to content

Commit 0cccc4a

Browse files
authored
Merge pull request kodecocodes#366 from JaapWijnen/master
Set Cover migrated to swift 3
2 parents c5f482c + 9d5c990 commit 0cccc4a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Set Cover (Unweighted)/README.markdown

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ If there is no cover within the group of sets, `cover` returns `nil`.
3030

3131
[Set cover problem on Wikipedia](https://en.wikipedia.org/wiki/Set_cover_problem)
3232

33-
*Written for Swift Algorithm Club by [Michael C. Rael](https://github.com/mrael2)*
33+
*Written for Swift Algorithm Club by [Michael C. Rael](https://github.com/mrael2)*
34+
*Migrated to Swift 3 by Jaap Wijnen*

Set Cover (Unweighted)/SetCover.playground/Sources/RandomArrayOfSets.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public func randomArrayOfSets<T>(covering universe: Set<T>,
1818

1919
while true {
2020
let randomUniverseIndex = Int(arc4random_uniform(UInt32(universe.count)))
21-
for (setIndex, value) in universe.enumerate() {
21+
for (setIndex, value) in universe.enumerated() {
2222
if setIndex == randomUniverseIndex {
2323
generatedSet.insert(value)
2424
break

Set Cover (Unweighted)/SetCover.playground/Sources/SetCover.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public extension Set {
88
var largestSet: Set<Element>?
99

1010
for set in array {
11-
let intersectionLength = remainingSet.intersect(set).count
11+
let intersectionLength = remainingSet.intersection(set).count
1212
if intersectionLength > largestIntersectionLength {
1313
largestIntersectionLength = intersectionLength
1414
largestSet = set
@@ -21,7 +21,7 @@ public extension Set {
2121
while !remainingSet.isEmpty {
2222
guard let largestSet = largestIntersectingSet() else { break }
2323
result!.append(largestSet)
24-
remainingSet = remainingSet.subtract(largestSet)
24+
remainingSet = remainingSet.subtracting(largestSet)
2525
}
2626

2727
if !remainingSet.isEmpty || isEmpty {

0 commit comments

Comments
 (0)