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

Merge pull request #35 from jasonhotsauce/master 

Fix division and add dist method
This commit is contained in:
Robert F. Dickerson 2016-01-29 18:58:39 -06:00
parent cc4e3e9718 f40b3c6a99
commit 6f5db25659
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Arithmetic.swift
View File

@ -245,6 +245,26 @@ public func dot(x: [Double], y: [Double]) -> Double {
return result
}
// MARK: - Distance
public func dist(x: [Float], y: [Float]) -> Float {
precondition(x.count == y.count, "Vectors must have equal count")
let sub = x - y
var squared = [Float](count: x.count, repeatedValue: 0.0)
vDSP_vsq(sub, 1, &squared, 1, vDSP_Length(x.count))
return sqrt(sum(squared))
}
public func dist(x: [Double], y: [Double]) -> Double {
precondition(x.count == y.count, "Vectors must have equal count")
let sub = x - y
var squared = [Double](count: x.count, repeatedValue: 0.0)
vDSP_vsqD(sub, 1, &squared, 1, vDSP_Length(x.count))
return sqrt(sum(squared))
}
// MARK: - Operators
func + (lhs: [Float], rhs: [Float]) -> [Float] {

4
Source/Matrix.swift
View File

@ -165,13 +165,13 @@ public func mul(x: Matrix<Double>, y: Matrix<Double>) -> Matrix<Double> {
}
public func div(x: Matrix<Double>, y: Matrix<Double>) -> Matrix<Double> {
let yInv = y′
let yInv = inv(y)
precondition(x.columns == yInv.rows, "Matrix dimensions not compatible")
return mul(x, y: yInv)
}
public func div(x: Matrix<Float>, y: Matrix<Float>) -> Matrix<Float> {
let yInv = y′
let yInv = inv(y)
precondition(x.columns == yInv.rows, "Matrix dimensions not compatible")
return mul(x, y: yInv)
}