From d9d15fb735014c5c4ff4ca1ffa693290c00ef076 Mon Sep 17 00:00:00 2001 From: Clint Caywood Date: Sat, 24 Oct 2015 22:44:24 -0700 Subject: [PATCH] Fix breakage due to gonum/matrix mat64.ErrShape --- knn/knn.go | 3 ++- metrics/pairwise/chebyshev.go | 3 ++- metrics/pairwise/cranberra.go | 3 ++- metrics/pairwise/manhattan.go | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/knn/knn.go b/knn/knn.go index fe69bbc..1770c0d 100644 --- a/knn/knn.go +++ b/knn/knn.go @@ -5,6 +5,7 @@ package knn import ( "fmt" + "github.com/gonum/matrix" "github.com/gonum/matrix/mat64" "github.com/sjwhitworth/golearn/base" "github.com/sjwhitworth/golearn/metrics/pairwise" @@ -235,7 +236,7 @@ func NewKnnRegressor(distfunc string) *KNNRegressor { func (KNN *KNNRegressor) Fit(values []float64, numbers []float64, rows int, cols int) { if rows != len(values) { - panic(mat64.ErrShape) + panic(matrix.ErrShape) } KNN.Data = mat64.NewDense(rows, cols, numbers) diff --git a/metrics/pairwise/chebyshev.go b/metrics/pairwise/chebyshev.go index 86f5663..c169e83 100644 --- a/metrics/pairwise/chebyshev.go +++ b/metrics/pairwise/chebyshev.go @@ -3,6 +3,7 @@ package pairwise import ( "math" + "github.com/gonum/matrix" "github.com/gonum/matrix/mat64" ) @@ -16,7 +17,7 @@ func (c *Chebyshev) Distance(vectorX *mat64.Dense, vectorY *mat64.Dense) float64 r1, c1 := vectorX.Dims() r2, c2 := vectorY.Dims() if r1 != r2 || c1 != c2 { - panic(mat64.ErrShape) + panic(matrix.ErrShape) } max := float64(0) diff --git a/metrics/pairwise/cranberra.go b/metrics/pairwise/cranberra.go index 09551de..06a99b4 100644 --- a/metrics/pairwise/cranberra.go +++ b/metrics/pairwise/cranberra.go @@ -3,6 +3,7 @@ package pairwise import ( "math" + "github.com/gonum/matrix" "github.com/gonum/matrix/mat64" ) @@ -23,7 +24,7 @@ func (c *Cranberra) Distance(vectorX *mat64.Dense, vectorY *mat64.Dense) float64 r1, c1 := vectorX.Dims() r2, c2 := vectorY.Dims() if r1 != r2 || c1 != c2 { - panic(mat64.ErrShape) + panic(matrix.ErrShape) } sum := .0 diff --git a/metrics/pairwise/manhattan.go b/metrics/pairwise/manhattan.go index 5664a9d..c9d3b75 100644 --- a/metrics/pairwise/manhattan.go +++ b/metrics/pairwise/manhattan.go @@ -3,6 +3,7 @@ package pairwise import ( "math" + "github.com/gonum/matrix" "github.com/gonum/matrix/mat64" ) @@ -18,7 +19,7 @@ func (m *Manhattan) Distance(vectorX *mat64.Dense, vectorY *mat64.Dense) float64 r1, c1 := vectorX.Dims() r2, c2 := vectorY.Dims() if r1 != r2 || c1 != c2 { - panic(mat64.ErrShape) + panic(matrix.ErrShape) } result := .0