Skip to content

Change comparisons to increase code uniformity in max and min algorithms #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
panzarino wants to merge 1 commit into from
Closed

Change comparisons to increase code uniformity in max and min algorithms #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions stdlib/public/core/Algorithm.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public func find<
@warn_unused_result
public func min<T : Comparable>(x: T, _ y: T) -> T {
var r = x
if y < x {
if y < r {
r = y
}
return r
Expand All @@ -57,7 +57,7 @@ public func min<T : Comparable>(x: T, _ y: T) -> T {
@warn_unused_result
public func min<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
var r = x
if y < x {
if y < r {
r = y
}
if z < r {
Expand All @@ -75,7 +75,7 @@ public func min<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
@warn_unused_result
public func max<T : Comparable>(x: T, _ y: T) -> T {
var r = y
if y < x {
if r < x {
r = x
}
return r
Expand All @@ -85,14 +85,14 @@ public func max<T : Comparable>(x: T, _ y: T) -> T {
@warn_unused_result
public func max<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
var r = y
if y < x {
if r < x {
r = x
}
if r < z {
r = z
}
for t in rest {
if t >= r {
if r <= t {
r = t
}
}
Expand Down