[Math] Fix up the matrices

Math/Math/Matrix.swift

@@ -7,42 +7,69 @@
 //
 
 /** A square matrix. */
-protocol Matrix {
+public protocol Matrix {
-    typealias ElementType
+    static var identity: Self { get }
 
-    static func dimension() -> Int
+    /** Number of elements in the underlying container. */
-    static func size() -> Int
+    static var count: Int { get }
+
+    /**
+     * Number of elements in a single row or column of the matrix. Since
+     * matrices are always square, this applies to row and column.
+     */
+    static var dimension: Int { get }
 
     init()
-    init?(values: [ElementType])
+    init(values: [Float]) throws
 
-    subscript(idx: Int) -> ElementType { get set }
+    /** 
-    subscript(row: Int, col: Int) -> ElementType { get set }
+     * Element access
+     * @{
+     */
+    subscript(idx: Int) -> Float { get set }
+    subscript(row: Int, col: Int) -> Float { get set }
+    /** @} */
+}
+
+extension Matrix {
+    public static var count: Int {
+        return dimension * dimension
+    }
+}
+
+public enum MatrixError: ErrorType {
+    case InvalidSize(given: Int, expected: Int)
 }
 
 // MARK: - Matrices
 
-public struct Matrix4<T: FloatingPointType>: Matrix {
+public struct Matrix4: Matrix {
-    static func dimension() -> Int {
+    public static var identity: Matrix4 = {
-        return 4
+        var matrix = Matrix4()
-    }
+        for i in 0..<Matrix4.dimension {
+            matrix[i,i] = 1.0
+        }
+        return matrix
+    }()
 
-    static func size() -> Int {
+    private var data: [Float]
-        return dimension() * dimension()
-    }
-
-    public private(set) var data: [T]
 
     public init() {
-        data = [T](count: Matrix4.size(), repeatedValue: T(0))
+        data = [Float](count: Matrix4.count, repeatedValue: Float(0))
     }
 
-    public init?(values: [T]) {
+    public init(values: [Float]) throws {
-        guard values.count == Matrix4.size() else { return nil }
+        guard values.count == Matrix4.count else {
+            throw MatrixError.InvalidSize(given: values.count, expected: Matrix4.count)
+        }
         data = values
     }
 
-    public subscript(idx: Int) -> T {
+    public static var dimension: Int {
+        return 4
+    }
+
+    public subscript(idx: Int) -> Float {
         get {
             return data[idx]
         }
@@ -51,7 +78,7 @@ public struct Matrix4<T: FloatingPointType>: Matrix {
         }
     }
 
-    public subscript(row: Int, col: Int) -> T {
+    public subscript(row: Int, col: Int) -> Float {
         get {
             return data[indexFromCoordinates(row, col)]
         }
@@ -62,23 +89,138 @@ public struct Matrix4<T: FloatingPointType>: Matrix {
 
     /** Convert a (row, col) pair into an index into the data array. */
     private func indexFromCoordinates(row: Int, _ col: Int) -> Int {
-        return row * Matrix4.dimension() + col
+        return row * Matrix4.dimension + col
     }
 }
 
+public struct Matrix3: Matrix {
+    public static var identity: Matrix3 = {
+        var matrix = Matrix3()
+        for i in 0..<Matrix3.dimension {
+            matrix[i,i] = 1.0
+        }
+        return matrix
+    }()
 
-struct Matrix3 {
+    private var data: [Float]
-    static let Rows = 3
+
-    static let Cols = 3
+    public init() {
-    static let Size = Matrix3.Rows * Matrix3.Cols
+        data = [Float](count: Matrix3.count, repeatedValue: Float(0))
+    }
+
+    public init(values: [Float]) throws {
+        guard values.count == Matrix3.count else {
+            throw MatrixError.InvalidSize(given: values.count, expected: Matrix3.count)
+        }
+        data = values
+    }
+
+    public static var dimension: Int {
+        return 3
+    }
+
+    public subscript(idx: Int) -> Float {
+        get {
+            return data[idx]
+        }
+        set(value) {
+            data[idx] = value
+        }
+    }
+
+    public subscript(row: Int, col: Int) -> Float {
+        get {
+            return data[indexFromCoordinates(row, col)]
+        }
+        set(value) {
+            data[indexFromCoordinates(row, col)] = value
+        }
+    }
+
+    /** Convert a (row, col) pair into an index into the data array. */
+    private func indexFromCoordinates(row: Int, _ col: Int) -> Int {
+        return row * Matrix4.dimension + col
+    }
 }
 
-// MARK: Vectors
+// MARK: - Operators
 
+public prefix func -<T: Matrix>(m: T) -> T {
+    var out = m
+    for i in 0..<T.count {
+        out[i] -= -out[i]
+    }
+    return out
+}
 
+// MARK: Matrix-Scalar Multiplication
 
-// MARK: - Matrix-Scalar Multiplication
+public func *=<T: Matrix>(inout lhs: T, rhs: Float) {
+    for i in 0..<T.count {
+        lhs[i] *= rhs
+    }
+}
 
+public func *<T: Matrix>(lhs: T, rhs: Float) -> T {
+    var out = lhs
+    out *= rhs
+    return out
+}
+
+public func *<T: Matrix>(lhs: Float, rhs: T) -> T {
+    return rhs * lhs
+}
+
+public func /=<T: Matrix>(inout lhs: T, rhs: Float) {
+    lhs *= (1.0 / rhs)
+}
+
+public func /<T: Matrix>(lhs: T, rhs: Float) -> T {
+    var out = lhs
+    out /= rhs
+    return out
+}
+
+// MARK: Matrix-Matrix multiplication
+
+public func *=<T: Matrix>(inout lhs: T, rhs: T) {
+    for i in 0..<T.dimension {
+        for j in 0..<T.dimension {
+            // Each cell is Sigma(k=0, M)(lhs[ik] * rhs[kj]
+            for k in 0..<T.dimension {
+                lhs[i,j] += lhs[i,k] * rhs[k,j]
+            }
+        }
+    }
+}
+
+public func *<T: Matrix>(lhs: T, rhs: T) -> T {
+    var out = lhs
+    out *= rhs
+    return out
+}
+
+// MARK: Matrix-Vector multiplication
+
+public func *(lhs: Matrix4, rhs: Vector4) -> Vector4 {
+    var out = Vector4()
+    for i in 0..<Matrix4.dimension {
+        for j in 0..<Matrix4.dimension {
+            out[i] += lhs[i] * rhs[j]
+        }
+    }
+    return out
+}
+
+public func *(lhs: Matrix3, rhs: Vector3) -> Vector3 {
+    var out = Vector3()
+    for i in 0..<Matrix3.dimension {
+        for j in 0..<Matrix3.dimension {
+            out[i] += lhs[i] * rhs[j]
+        }
+    }
+    return out
+}
 
 //func *<T: FloatingPointType>(matrix: Matrix4<T>, scalar: T) -> Matrix4<T> {
 //    var out: Matrix4<T>