From 97f62123192bb22fe10d9c09bb923b44ea7c7a90 Mon Sep 17 00:00:00 2001 From: Jason Zhu Date: Tue, 5 Nov 2019 21:23:12 -0800 Subject: [PATCH 1/2] Fix import paths to use gonum.org/v1/gonum --- knn/knn.go | 2 +- linear_models/linear_regression.go | 2 +- metrics/pairwise/chebyshev.go | 2 +- metrics/pairwise/cranberra.go | 2 +- metrics/pairwise/manhattan.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/knn/knn.go b/knn/knn.go index 0ce44fa..e932d4b 100644 --- a/knn/knn.go +++ b/knn/knn.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/gonum/matrix" + matrix "gonum.org/v1/gonum/mat" "github.com/sjwhitworth/golearn/base" "github.com/sjwhitworth/golearn/kdtree" "github.com/sjwhitworth/golearn/metrics/pairwise" diff --git a/linear_models/linear_regression.go b/linear_models/linear_regression.go index eb52c4e..5df4b93 100644 --- a/linear_models/linear_regression.go +++ b/linear_models/linear_regression.go @@ -6,7 +6,7 @@ import ( "github.com/sjwhitworth/golearn/base" "fmt" - _ "github.com/gonum/blas" + _ "gonum.org/v1/gonum/blas" "gonum.org/v1/gonum/mat" ) diff --git a/metrics/pairwise/chebyshev.go b/metrics/pairwise/chebyshev.go index 23a6fb1..ccfb472 100644 --- a/metrics/pairwise/chebyshev.go +++ b/metrics/pairwise/chebyshev.go @@ -3,7 +3,7 @@ package pairwise import ( "math" - "github.com/gonum/matrix" + matrix "gonum.org/v1/gonum/mat" "gonum.org/v1/gonum/mat" ) diff --git a/metrics/pairwise/cranberra.go b/metrics/pairwise/cranberra.go index eb36f6c..f86e879 100644 --- a/metrics/pairwise/cranberra.go +++ b/metrics/pairwise/cranberra.go @@ -3,7 +3,7 @@ package pairwise import ( "math" - "github.com/gonum/matrix" + matrix "gonum.org/v1/gonum/mat" "gonum.org/v1/gonum/mat" ) diff --git a/metrics/pairwise/manhattan.go b/metrics/pairwise/manhattan.go index 29c9ba9..52a0558 100644 --- a/metrics/pairwise/manhattan.go +++ b/metrics/pairwise/manhattan.go @@ -3,7 +3,7 @@ package pairwise import ( "math" - "github.com/gonum/matrix" + matrix "gonum.org/v1/gonum/mat" "gonum.org/v1/gonum/mat" ) From d252e1174b1ba554833ebde97fff6d25f3d28310 Mon Sep 17 00:00:00 2001 From: Jason Zhu Date: Wed, 13 Nov 2019 23:09:00 -0800 Subject: [PATCH 2/2] Remove duplicate import paths --- knn/knn.go | 3 +-- metrics/pairwise/chebyshev.go | 3 +-- metrics/pairwise/cranberra.go | 3 +-- metrics/pairwise/manhattan.go | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/knn/knn.go b/knn/knn.go index e932d4b..91bc661 100644 --- a/knn/knn.go +++ b/knn/knn.go @@ -7,7 +7,6 @@ import ( "errors" "fmt" - matrix "gonum.org/v1/gonum/mat" "github.com/sjwhitworth/golearn/base" "github.com/sjwhitworth/golearn/kdtree" "github.com/sjwhitworth/golearn/metrics/pairwise" @@ -430,7 +429,7 @@ func NewKnnRegressor(distfunc string) *KNNRegressor { func (KNN *KNNRegressor) Fit(values []float64, numbers []float64, rows int, cols int) { if rows != len(values) { - panic(matrix.ErrShape) + panic(mat.ErrShape) } KNN.Data = mat.NewDense(rows, cols, numbers) diff --git a/metrics/pairwise/chebyshev.go b/metrics/pairwise/chebyshev.go index ccfb472..8eed3ff 100644 --- a/metrics/pairwise/chebyshev.go +++ b/metrics/pairwise/chebyshev.go @@ -3,7 +3,6 @@ package pairwise import ( "math" - matrix "gonum.org/v1/gonum/mat" "gonum.org/v1/gonum/mat" ) @@ -17,7 +16,7 @@ func (c *Chebyshev) Distance(vectorX *mat.Dense, vectorY *mat.Dense) float64 { r1, c1 := vectorX.Dims() r2, c2 := vectorY.Dims() if r1 != r2 || c1 != c2 { - panic(matrix.ErrShape) + panic(mat.ErrShape) } max := float64(0) diff --git a/metrics/pairwise/cranberra.go b/metrics/pairwise/cranberra.go index f86e879..671143f 100644 --- a/metrics/pairwise/cranberra.go +++ b/metrics/pairwise/cranberra.go @@ -3,7 +3,6 @@ package pairwise import ( "math" - matrix "gonum.org/v1/gonum/mat" "gonum.org/v1/gonum/mat" ) @@ -24,7 +23,7 @@ func (c *Cranberra) Distance(vectorX *mat.Dense, vectorY *mat.Dense) float64 { r1, c1 := vectorX.Dims() r2, c2 := vectorY.Dims() if r1 != r2 || c1 != c2 { - panic(matrix.ErrShape) + panic(mat.ErrShape) } sum := .0 diff --git a/metrics/pairwise/manhattan.go b/metrics/pairwise/manhattan.go index 52a0558..f355fec 100644 --- a/metrics/pairwise/manhattan.go +++ b/metrics/pairwise/manhattan.go @@ -3,7 +3,6 @@ package pairwise import ( "math" - matrix "gonum.org/v1/gonum/mat" "gonum.org/v1/gonum/mat" ) @@ -19,7 +18,7 @@ func (m *Manhattan) Distance(vectorX *mat.Dense, vectorY *mat.Dense) float64 { r1, c1 := vectorX.Dims() r2, c2 := vectorY.Dims() if r1 != r2 || c1 != c2 { - panic(matrix.ErrShape) + panic(mat.ErrShape) } result := .0