Skip to content

Modified min and max for code uniformity #188

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
wants to merge 2 commits into from
Closed

Modified min and max for code uniformity #188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33a7d9a
Modified min and max for code uniformity
m16vie Dec 4, 2015
d301ed6
max will now return the last maximum instance
m16vie Dec 4, 2015
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
18 changes: 9 additions & 9 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 @@ -74,21 +74,21 @@ public func min<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
/// Returns the greater of `x` and `y`.
@warn_unused_result
public func max<T : Comparable>(x: T, _ y: T) -> T {
var r = y
if y < x {
r = x
var r = x
if y >= r {
r = y
}
return r
}

/// Returns the greatest argument passed.
@warn_unused_result
public func max<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
var r = y
if y < x {
r = x
var r = x
if y >= r {
r = y
}
if r < z {
if z >= r {
r = z
}
for t in rest {
Expand Down