Merge pull request sjwhitworth#147 from Sentimentron/issue-146

metrics: update dot-product to match new mat64 version
smnalex · Sep 28, 2016 · 9345938 · 9345938
2 parents 473ffe8 + fab0758
commit 9345938
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/metrics/pairwise/euclidean.go b/metrics/pairwise/euclidean.go
@@ -14,7 +14,9 @@ func NewEuclidean() *Euclidean {
 
 // InnerProduct computes a Eucledian inner product.
 func (e *Euclidean) InnerProduct(vectorX *mat64.Dense, vectorY *mat64.Dense) float64 {
-	result := mat64.Dot(vectorX, vectorY)
+	subVector := mat64.NewDense(0, 0, nil)
+	subVector.MulElem(vectorX, vectorY)
+	result := mat64.Sum(subVector)
 
 	return result
 }

diff --git a/metrics/pairwise/poly_kernel.go b/metrics/pairwise/poly_kernel.go
@@ -18,7 +18,9 @@ func NewPolyKernel(degree int) *PolyKernel {
 // InnerProduct computes the inner product through a kernel trick
 // K(x, y) = (x^T y + 1)^d
 func (p *PolyKernel) InnerProduct(vectorX *mat64.Dense, vectorY *mat64.Dense) float64 {
-	result := mat64.Dot(vectorX, vectorY)
+	subVectorX := vectorX.ColView(0)
+	subVectorY := vectorY.ColView(0)
+	result := mat64.Dot(subVectorX, subVectorY)
 	result = math.Pow(result+1, float64(p.degree))
 
 	return result