Skip to content

Commit 87d93f7

Browse files
author
Yi Gu
committed
[Sort] code style fixed
1 parent 93f06fa commit 87d93f7

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

Sort/MeetingRooms.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
class MeetingRooms {
1818
func canAttendMeetings(intervals: [Interval]) -> Bool {
19-
if intervals.count < 2 {
19+
guard intervals.count > 1 else {
2020
return true
2121
}
2222

2323
var intervals = intervals.sort({$0.start < $1.start})
2424

25-
for i in 0...intervals.count - 2 {
25+
for i in 0 ..< intervals.count - 1 {
2626
if intervals[i].end > intervals[i + 1].start {
2727
return false
2828
}

Sort/MergeIntervals.swift

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,24 @@
1616

1717
class MergeIntervals {
1818
func merge(intervals: [Interval]) -> [Interval] {
19-
if intervals.count <= 1 {
19+
guard intervals.count > 1 else {
2020
return intervals
2121
}
2222

23-
var intervals = intervals.sort(sortIntervals)
23+
var intervals = intervals.sort() {
24+
if $0.start != $1.start {
25+
return $0.start < $1.start
26+
} else {
27+
return $0.end < $1.end
28+
}
29+
}
2430

2531
var res = [Interval]()
2632
res.append(intervals[0])
2733

2834
for i in 1..<intervals.count {
29-
var last = res[res.count - 1]
30-
var current = intervals[i]
35+
let last = res[res.count - 1]
36+
let current = intervals[i]
3137
if current.start > last.end {
3238
res.append(current)
3339
} else {
@@ -37,12 +43,4 @@ class MergeIntervals {
3743

3844
return res
3945
}
40-
41-
private func sortIntervals(p: Interval, q: Interval) -> Bool {
42-
if p.start != q.start {
43-
return p.start < q.start
44-
} else {
45-
return p.end < q.end
46-
}
47-
}
4846
}

0 commit comments

Comments
 (0)