Replace ip_round extension on Double for BinaryFloatingPoint #161
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| // | ||
| // BinaryFloatingPoint+Extensions.swift | ||
| // SwiftWisdom | ||
| // | ||
| // Created by Stephen Wong on 5/1/16. | ||
| // Copyright © 2016 Intrepid. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| extension BinaryFloatingPoint { | ||
| /// https://codereview.stackexchange.com/questions/142748/swift-floatingpoint-rounded-to-places | ||
|
There was a problem hiding this comment. We might want to give this link the |
||
| public func ip_rounded(toDecimalPlaces places: Int) -> Self { | ||
| guard places >= 0 else { return self } | ||
| let divisor = Self((0..<places).reduce(1.0) { (result, _) in result * 10.0 }) | ||
| return (self * divisor).rounded() / divisor | ||
| } | ||
|
|
||
| /// https://codereview.stackexchange.com/questions/142748/swift-floatingpoint-rounded-to-places | ||
| public mutating func ip_round(toDecimalPlaces places: Int) { | ||
| guard places >= 0 else { return } | ||
| let divisor = Self((0..<places).reduce(1.0) { (result, _) in result * 10.0 }) | ||
| self = (self * divisor).rounded() / divisor | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // | ||
| // BinaryFloatingPointTests.swift | ||
| // SwiftWisdom | ||
| // | ||
| // Created by Stephen Wong on 5/1/16. | ||
| // Copyright © 2016 Intrepid. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
| import SwiftWisdom | ||
|
|
||
| class BinaryFloatingPointTests: XCTestCase { | ||
|
|
||
| func testRoundingDoubles() { | ||
| let unroundedDoubles = [.pi, 5.0156, 10.014, 9999.99499] | ||
| let roundedToOneDecimalPlaces = [3.1, 5.0, 10.0, 10000.0] | ||
| let roundedToTwoDecimalPlaces = [3.14, 5.02, 10.01, 9999.99] | ||
| let roundedToFiveDecimalPlaces = [3.14159, 5.0156, 10.014, 9999.99499] | ||
|
|
||
| for (index, unroundedDouble) in unroundedDoubles.enumerated() { | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 1), roundedToOneDecimalPlaces[index]) | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 2), roundedToTwoDecimalPlaces[index]) | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 5), roundedToFiveDecimalPlaces[index]) | ||
| } | ||
| } | ||
|
|
||
| func testRoundingFloats() { | ||
| let unroundedFloats: [Float] = [.pi, 5.0156, 10.014, 9999.99499] | ||
| let roundedToOneDecimalPlaces: [Float] = [3.1, 5.0, 10.0, 10000.0] | ||
| let roundedToTwoDecimalPlaces: [Float] = [3.14, 5.02, 10.01, 9999.99] | ||
| let roundedToFiveDecimalPlaces: [Float] = [3.14159, 5.0156, 10.014, 9999.99499] | ||
|
|
||
| for (index, unroundedDouble) in unroundedFloats.enumerated() { | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 1), roundedToOneDecimalPlaces[index]) | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 2), roundedToTwoDecimalPlaces[index], accuracy: 0.01) | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 5), roundedToFiveDecimalPlaces[index]) | ||
| } | ||
| } | ||
|
|
||
| func testRoundingCGFloats() { | ||
| let unroundedFloats: [CGFloat] = [.pi, 5.0156, 10.014, 9999.99499] | ||
| let roundedToOneDecimalPlaces: [CGFloat] = [3.1, 5.0, 10.0, 10000.0] | ||
| let roundedToTwoDecimalPlaces: [CGFloat] = [3.14, 5.02, 10.01, 9999.99] | ||
| let roundedToFiveDecimalPlaces: [CGFloat] = [3.14159, 5.0156, 10.014, 9999.99499] | ||
|
|
||
| for (index, unroundedDouble) in unroundedFloats.enumerated() { | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 1), roundedToOneDecimalPlaces[index]) | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 2), roundedToTwoDecimalPlaces[index]) | ||
| XCTAssertEqual(unroundedDouble.ip_rounded(toDecimalPlaces: 5), roundedToFiveDecimalPlaces[index]) | ||
| } | ||
| } | ||
|
|
||
| func testRoundInPlace() { | ||
| // Double | ||
| var pi_double: Double = .pi | ||
| pi_double.ip_round(toDecimalPlaces: 1) | ||
| XCTAssertEqual(pi_double, 3.1) | ||
| pi_double = .pi // Reset | ||
| pi_double.ip_round(toDecimalPlaces: 2) | ||
| XCTAssertEqual(pi_double, 3.14) | ||
| pi_double = .pi // Reset | ||
| pi_double.ip_round(toDecimalPlaces: 5) | ||
| XCTAssertEqual(pi_double, 3.14159) | ||
|
|
||
| // Float | ||
| var pi_float: Float = .pi | ||
| pi_float.ip_round(toDecimalPlaces: 1) | ||
| XCTAssertEqual(pi_float, 3.1) | ||
| pi_float = .pi // Reset | ||
| pi_float.ip_round(toDecimalPlaces: 2) | ||
| XCTAssertEqual(pi_float, 3.14) | ||
| pi_float = .pi // Reset | ||
| pi_float.ip_round(toDecimalPlaces: 5) | ||
| XCTAssertEqual(pi_float, 3.14159) | ||
|
|
||
| // CGFloat | ||
| var pi_cgfloat: CGFloat = .pi | ||
| pi_cgfloat.ip_round(toDecimalPlaces: 1) | ||
| XCTAssertEqual(pi_cgfloat, 3.1) | ||
| pi_cgfloat = .pi // Reset | ||
| pi_cgfloat.ip_round(toDecimalPlaces: 2) | ||
| XCTAssertEqual(pi_cgfloat, 3.14) | ||
| pi_cgfloat = .pi // Reset | ||
| pi_cgfloat.ip_round(toDecimalPlaces: 5) | ||
| XCTAssertEqual(pi_cgfloat, 3.14159) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did this change? Did you re-run
pod installIf so, you could probably check in thePodfile.lockThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did run
pod installto generate the workspaceThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmm, since that made THIS change, didn't it also update
Podfile.lock? You should rerun it and check in the lock file if it changed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like the lock file did not change.