dnrops
/
Surge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting

This commit is contained in:
Vincent Esche 2019-08-06 19:26:46 +02:00
parent 66faf493f5
commit b3a75fa6d3
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/Surge/Matrix.swift
View File

@ -210,21 +210,19 @@ extension Matrix: Sequence {
extension Matrix: Collection {
public subscript(_ row: Int) -> ArraySlice<Scalar> {
get {
let startIndex = row * columns
let endIndex = startIndex + columns
return self.grid[startIndex..<endIndex]
}
let startIndex = row * columns
let endIndex = startIndex + columns
return self.grid[startIndex..<endIndex]
}
public var startIndex: Int {
return 0
}
public var endIndex: Int {
return self.rows
}
public func index(after i: Int) -> Int {
return i + 1
}

24
Tests/SurgeTests/XCTAssert+Surge.swift
View File

@ -42,32 +42,31 @@ func XCTAssertEqual<T, U>(
file: StaticString = #file,
line: UInt = #line
) -> Bool
where T: Collection, T.Element == U, U: FloatingPoint
{
where T: Collection, T.Element == U, U: FloatingPoint {
let (actualValues, expectedValues): (T, T)
do {
(actualValues, expectedValues) = (try expression1(), try expression2())
} catch let error {
XCTFail("Error: \(error)", file: file, line: line)
return false
}
XCTAssertEqual(actualValues.count, expectedValues.count, file: file, line: line)
for (actual, expected) in Swift.zip(actualValues, expectedValues) {
guard abs(actual - expected) > abs(accuracy) else {
continue
}
let failureMessage = "XCTAssertEqualWithAccuracy failed: (\(actual)) is not equal to (\(expected)) +/- (\(accuracy))"
let userMessage = message()
let message = "\(failureMessage) - \(userMessage)"
XCTFail(message, file: file, line: line)
return false
}
return true
}
@ -96,19 +95,18 @@ func XCTAssertEqual<T, U, V>(
file: StaticString = #file,
line: UInt = #line
) -> Bool
where T: Collection, U: Collection, T.Element == U, U.Element == V, V: FloatingPoint
{
where T: Collection, U: Collection, T.Element == U, U.Element == V, V: FloatingPoint {
let (actualValues, expectedValues): (T, T)
do {
(actualValues, expectedValues) = (try expression1(), try expression2())
} catch let error {
XCTFail("Error: \(error)", file: file, line: line)
return false
}
XCTAssertEqual(actualValues.count, expectedValues.count, file: file, line: line)
for (actual, expected) in Swift.zip(actualValues, expectedValues) {
guard XCTAssertEqual(actual, expected, accuracy: accuracy) else {
return false