OrgLion-ML/golearn
1
0
Fork 0
mirror of https://github.com/sjwhitworth/golearn.git synced 2025-04-26 13:49:14 +08:00
Code Issues Releases Wiki Activity

Use gonum/matrix/mat64, life is easier.

Browse Source
This commit is contained in:
Bert Chang 2014-05-03 00:55:38 +08:00
parent 4fc0ed0477
commit 804cd82cfc
3 changed files with 13 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
metrics/pairwise/euclidean.go
View File

@ -3,7 +3,7 @@ package pairwise
import ( import (
"math" "math"
mat "github.com/skelterjohn/go.matrix" "github.com/gonum/matrix/mat64"
) )
type Euclidean struct{} type Euclidean struct{}
@ -12,23 +12,17 @@ func NewEuclidean() *Euclidean {
return &Euclidean{} return &Euclidean{}
} }
func (self *Euclidean) InnerProduct(vectorX *mat.DenseMatrix, vectorY *mat.DenseMatrix) float64 { func (self *Euclidean) InnerProduct(vectorX *mat64.Dense, vectorY *mat64.Dense) float64 {
CheckDimMatch(vectorX, vectorY) result := vectorX.Dot(vectorY)
result := mat.Product(mat.Transpose(vectorX), vectorY).Get(0, 0)
return result return result
} }
// We may need to create Metrics / Vector interface for this // We may need to create Metrics / Vector interface for this
func (self *Euclidean) Distance(vectorX *mat.DenseMatrix, vectorY *mat.DenseMatrix) (float64, error) { func (self *Euclidean) Distance(vectorX *mat64.Dense, vectorY *mat64.Dense) float64 {
difference, err := vectorY.MinusDense(vectorX) vectorX.Sub(vectorX, vectorY)
if err != nil { result := self.InnerProduct(vectorX, vectorX)
return 0, err
} return math.Sqrt(result)
result := self.InnerProduct(difference, difference)
return math.Sqrt(result), nil
} }

18
metrics/pairwise/euclidean_test.go
View File

@ -2,17 +2,17 @@ package pairwise
import ( import (
"testing" "testing"
. "github.com/smartystreets/goconvey/convey"
mat "github.com/skelterjohn/go.matrix" "github.com/gonum/matrix/mat64"
. "github.com/smartystreets/goconvey/convey"
) )
func TestEuclidean(t *testing.T) { func TestEuclidean(t *testing.T) {
euclidean := NewEuclidean() euclidean := NewEuclidean()
Convey("Given two vectors", t, func() { Convey("Given two vectors", t, func() {
vectorX := mat.MakeDenseMatrix([]float64{1, 2, 3}, 3, 1) vectorX := mat64.NewDense(3, 1, []float64{1, 2, 3})
vectorY := mat.MakeDenseMatrix([]float64{2, 4, 5}, 3, 1) vectorY := mat64.NewDense(3, 1, []float64{2, 4, 5})
Convey("When doing inner product", func() { Convey("When doing inner product", func() {
result := euclidean.InnerProduct(vectorX, vectorY) result := euclidean.InnerProduct(vectorX, vectorY)
@ -20,16 +20,6 @@ func TestEuclidean(t *testing.T) {
Convey("The result should be 25", func() { Convey("The result should be 25", func() {
So(result, ShouldEqual, 25) So(result, ShouldEqual, 25)
}) })
Convey("When dimension not match", func() {
vectorZ := mat.MakeDenseMatrix([]float64{3, 4, 5}, 1, 3)
Convey("It should panic with Dimension mismatch", func() {
So(func() { euclidean.InnerProduct(vectorX, vectorZ) }, ShouldPanicWith, "Dimension mismatch")
})
})
}) })
Convey("When calculating distance", func() { Convey("When calculating distance", func() {

6
metrics/pairwise/rbf_kernel.go
View File

@ -3,7 +3,7 @@ package pairwise
import ( import (
"math" "math"
mat "github.com/skelterjohn/go.matrix" "github.com/gonum/matrix/mat64"
) )
type RBFKernel struct { type RBFKernel struct {
@ -14,9 +14,7 @@ func NewRBFKernel(gamma float64) *RBFKernel {
return &RBFKernel{gamma: gamma} return &RBFKernel{gamma: gamma}
} }
func (self *RBFKernel) InnerProduct(vectorX *mat.DenseMatrix, vectorY *mat.DenseMatrix) (float64, error) { func (self *RBFKernel) InnerProduct(vectorX *mat64.Dense, vectorY *mat64.Dense) (float64, error) {
CheckDimMatch(vectorX, vectorY)
euclidean := NewEuclidean() euclidean := NewEuclidean()
distance, err := euclidean.Distance(vectorX, vectorY) distance, err := euclidean.Distance(vectorX, vectorY)