Skip to content

Added unit tests for matrix arithmetic #108

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

Merged
merged 9 commits into from
Aug 29, 2019
Merged

Added unit tests for matrix arithmetic #108

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd78037
Added unit tests for matrix arithmetic
regexident Aug 6, 2019
3e13863
Renamed existing remaining test functions to match naming scheme
regexident Aug 6, 2019
5597cef
Fix formatting
regexident Aug 6, 2019
489b817
Fixed swiftlint violations
regexident Aug 6, 2019
21caeec
Fixed failing unit test due to large float and resulting decreased ac…
regexident Aug 6, 2019
b2db8c9
Removed unused test function
regexident Aug 11, 2019
eed94e4
Moved computed test values into local `let actual` binding
regexident Aug 11, 2019
964ef19
Added missing unit tests for matrix initializers
regexident Aug 11, 2019
0c8f39e
Fixed unit tests for `Matrix.sum(_:axies:)`
regexident Aug 11, 2019
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
Prev Previous commit
Next Next commit
Moved computed test values into local let actual binding
  • Loading branch information
@regexident
regexident committed Aug 29, 2019
commit eed94e491208358317196ed68f5214401d4ce5e3
72 changes: 48 additions & 24 deletions Tests/SurgeTests/MatrixTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,55 +101,59 @@ class MatrixTests: XCTestCase {

let matrix: Matrix<Scalar> = getMatrix()

let actual = matrix + matrix
let expected: Matrix<Float> = [
[2, 4, 6, 8],
[10, 12, 14, 16],
[18, 20, 22, 24],
]

XCTAssertEqual(matrix + matrix, expected)
XCTAssertEqual(actual, expected)
}

func test_add_matrix_matrix_double() {
typealias Scalar = Double

let matrix: Matrix<Scalar> = getMatrix()

let actual = matrix + matrix
let expected: Matrix<Scalar> = [
[2, 4, 6, 8],
[10, 12, 14, 16],
[18, 20, 22, 24],
]

XCTAssertEqual(matrix + matrix, expected)
XCTAssertEqual(actual, expected)
}

func test_sub_matrix_matrix_float() {
typealias Scalar = Float

let matrix: Matrix<Scalar> = getMatrix()

let actual = matrix - matrix
let expected: Matrix<Float> = [
[0, 0, 0, 0],
[0, 0, 0, 0],
[0, 0, 0, 0],
]

XCTAssertEqual(matrix - matrix, expected)
XCTAssertEqual(actual, expected)
}

func test_sub_matrix_matrix_double() {
typealias Scalar = Double

let matrix: Matrix<Scalar> = getMatrix()

let actual = matrix - matrix
let expected: Matrix<Scalar> = [
[0, 0, 0, 0],
[0, 0, 0, 0],
[0, 0, 0, 0],
]

XCTAssertEqual(matrix - matrix, expected)
XCTAssertEqual(actual, expected)
}

func test_mul_scalar_matrix_float() {
Expand All @@ -162,12 +166,13 @@ class MatrixTests: XCTestCase {
[10, 12, 14],
]

let actual = lhs * rhs
let expected: Matrix<Scalar> = [
[4, 8, 12],
[20, 24, 28],
]

XCTAssertEqual(lhs * rhs, expected)
XCTAssertEqual(actual, expected)
}

func test_mul_scalar_matrix_double() {
Expand All @@ -180,12 +185,13 @@ class MatrixTests: XCTestCase {
[10, 12, 14],
]

let actual = lhs * rhs
let expected: Matrix<Scalar> = [
[4, 8, 12],
[20, 24, 28],
]

XCTAssertEqual(lhs * rhs, expected)
XCTAssertEqual(actual, expected)
}

func test_mul_matrix_matrix_float() {
Expand All @@ -202,13 +208,14 @@ class MatrixTests: XCTestCase {
[10, 12, 14],
]

let actual = lhs * rhs
let expected: Matrix<Scalar> = [
[44, 56, 68],
[140, 184, 228],
[236, 312, 388],
]

XCTAssertEqual(lhs * rhs, expected)
XCTAssertEqual(actual, expected)
}

func test_mul_matrix_matrix_double() {
Expand All @@ -225,13 +232,14 @@ class MatrixTests: XCTestCase {
[10, 12, 14],
]

let actual = lhs * rhs
let expected: Matrix<Scalar> = [
[44, 56, 68],
[140, 184, 228],
[236, 312, 388],
]

XCTAssertEqual(lhs * rhs, expected)
XCTAssertEqual(actual, expected)
}

func test_mul_matrix_vector_float() {
Expand Down Expand Up @@ -276,12 +284,13 @@ class MatrixTests: XCTestCase {

let rhs: Scalar = 2

let actual = lhs / rhs
let expected: Matrix<Scalar> = [
[1, 2, 3],
[5, 6, 7],
]

XCTAssertEqual(lhs / rhs, expected, accuracy: 1e-6)
XCTAssertEqual(actual, expected, accuracy: 1e-6)
}

func test_div_matrix_scalar_double() {
Expand All @@ -294,12 +303,13 @@ class MatrixTests: XCTestCase {

let rhs: Scalar = 2

let actual = lhs / rhs
let expected: Matrix<Scalar> = [
[1, 2, 3],
[5, 6, 7],
]

XCTAssertEqual(lhs / rhs, expected, accuracy: 1e-8)
XCTAssertEqual(actual, expected, accuracy: 1e-8)
}

func test_div_matrix_matrix_float() {
Expand All @@ -315,12 +325,13 @@ class MatrixTests: XCTestCase {
[1, -1],
]

let actual = lhs / rhs
let expected: Matrix<Scalar> = [
[10, 12],
[8, 10],
]

XCTAssertEqual(lhs / rhs, expected, accuracy: 1e-5)
XCTAssertEqual(actual, expected, accuracy: 1e-5)
}

func test_div_matrix_matrix_double() {
Expand All @@ -336,12 +347,13 @@ class MatrixTests: XCTestCase {
[1, -1],
]

let actual = lhs / rhs
let expected: Matrix<Scalar> = [
[10, 12],
[8, 10],
]

XCTAssertEqual(lhs / rhs, expected, accuracy: 1e-8)
XCTAssertEqual(actual, expected, accuracy: 1e-8)
}

func test_pow_matrix_scalar_float() {
Expand All @@ -354,13 +366,14 @@ class MatrixTests: XCTestCase {

let rhs: Scalar = 2

let actual = pow(lhs, rhs)
let expected: Matrix<Scalar> = .init(
lhs.map { row in
row.map { pow($0, rhs) }
}
)

XCTAssertEqual(pow(lhs, rhs), expected, accuracy: 1e-5)
XCTAssertEqual(actual, expected, accuracy: 1e-5)
}

func test_pow_matrix_scalar_double() {
Expand All @@ -373,13 +386,14 @@ class MatrixTests: XCTestCase {

let rhs: Scalar = 2

let actual = pow(lhs, rhs)
let expected: Matrix<Scalar> = .init(
lhs.map { row in
row.map { pow($0, rhs) }
}
)

XCTAssertEqual(pow(lhs, rhs), expected, accuracy: 1e-8)
XCTAssertEqual(actual, expected, accuracy: 1e-8)
}

func test_exp_matrix_float() {
Expand All @@ -390,13 +404,14 @@ class MatrixTests: XCTestCase {
[4, 5, 6],
]

let actual = exp(lhs)
let expected: Matrix<Scalar> = .init(
lhs.map { row in
row.map { exp($0) }
}
)

XCTAssertEqual(exp(lhs), expected, accuracy: 1e-3)
XCTAssertEqual(actual, expected, accuracy: 1e-3)
}

func test_exp_matrix_double() {
Expand All @@ -407,13 +422,14 @@ class MatrixTests: XCTestCase {
[4, 5, 6],
]

let actual = exp(lhs)
let expected: Matrix<Scalar> = .init(
lhs.map { row in
row.map { exp($0) }
}
)

XCTAssertEqual(exp(lhs), expected, accuracy: 1e-8)
XCTAssertEqual(actual, expected, accuracy: 1e-8)
}

func test_sum_matrix_rows_float() {
Expand All @@ -424,12 +440,13 @@ class MatrixTests: XCTestCase {
[4, 5, 6],
]

let actual = sum(lhs, axies: .column)
let expected: Matrix<Scalar> = [
[6],
[15],
]

XCTAssertEqual(sum(lhs, axies: .row), expected, accuracy: 1e-5)
XCTAssertEqual(actual, expected, accuracy: 1e-5)
}

func test_sum_matrix_columns_float() {
Expand All @@ -440,11 +457,12 @@ class MatrixTests: XCTestCase {
[4, 5, 6],
]

let actual = sum(lhs, axies: .column)
let expected: Matrix<Scalar> = [
[5, 7, 9],
]

XCTAssertEqual(sum(lhs, axies: .column), expected, accuracy: 1e-5)
XCTAssertEqual(actual, expected, accuracy: 1e-5)
}

func test_inv_matrix_double() {
Expand All @@ -455,12 +473,13 @@ class MatrixTests: XCTestCase {
[2, 2],
]

let actual = inv(lhs)
let expected: Matrix<Scalar> = [
[-1, 1.5],
[1, -1],
]

XCTAssertEqual(inv(lhs), expected, accuracy: 1e-8)
XCTAssertEqual(actual, expected, accuracy: 1e-8)
}

func test_inv_matrix_float() {
Expand All @@ -471,12 +490,13 @@ class MatrixTests: XCTestCase {
[2, 2],
]

let actual = inv(lhs)
let expected: Matrix<Scalar> = [
[-1, 1.5],
[1, -1],
]

XCTAssertEqual(inv(lhs), expected, accuracy: 1e-6)
XCTAssertEqual(actual, expected, accuracy: 1e-6)
}

func test_tranpose_matrix_double() {
Expand All @@ -487,13 +507,14 @@ class MatrixTests: XCTestCase {
[4, 5, 6],
]

let actual = transpose(lhs)
let expected: Matrix<Scalar> = [
[1, 4],
[2, 5],
[3, 6],
]

XCTAssertEqual(transpose(lhs), expected)
XCTAssertEqual(actual, expected)
}

func test_tranpose_matrix_float() {
Expand All @@ -504,13 +525,14 @@ class MatrixTests: XCTestCase {
[4, 5, 6],
]

let actual = transpose(lhs)
let expected: Matrix<Scalar> = [
[1, 4],
[2, 5],
[3, 6],
]

XCTAssertEqual(transpose(lhs), expected)
XCTAssertEqual(actual, expected)
}

func test_det_matrix_double() {
Expand All @@ -521,9 +543,10 @@ class MatrixTests: XCTestCase {
[5, 6],
]

let actual = det(lhs)
let expected: Scalar = 6 - 10

XCTAssertEqual(det(lhs), expected)
XCTAssertEqual(actual, expected)
}

func test_det_matrix_float() {
Expand All @@ -534,9 +557,10 @@ class MatrixTests: XCTestCase {
[5, 6],
]

let actual = det(lhs)
let expected: Scalar = 6 - 10

XCTAssertEqual(det(lhs), expected)
XCTAssertEqual(actual, expected)
}

func test_mul_empty_float() {
Expand Down