Merge pull request #29 from vladimir-ch/use-gonum-scalar

Use Gonum's scalar.EqualWithinAbs

Author: james-bowman

blas/matrix.go

@@ -1,7 +1,7 @@
 package blas
 
 import (
-	"gonum.org/v1/gonum/floats"
+	"gonum.org/v1/gonum/floats/scalar"
 	"gonum.org/v1/gonum/mat"
 )
 
@@ -80,7 +80,7 @@ func (m *SparseMatrix) insert(i int, j int, v float64, insertionPoint int) {
 func (m *SparseMatrix) nnzWithin(epsilon float64) int {
 	count := 0
 	for _, v := range m.Data {
-		if !floats.EqualWithinAbs(v, 0, epsilon) {
+		if !scalar.EqualWithinAbs(v, 0, epsilon) {
 			count++
 		}
 	}
@@ -102,7 +102,7 @@ func (m *SparseMatrix) Cull(epsilon float64) *SparseMatrix {
 		for minor := startIdx; minor < endIdx; minor++ {
 			col := m.Ind[minor]
 			v := m.Data[minor]
-			if !floats.EqualWithinAbs(v, 0, epsilon) {
+			if !scalar.EqualWithinAbs(v, 0, epsilon) {
 				newInd[curPos] = col
 				newData[curPos] = v
 				curPos++

cholesky.go

@@ -3,7 +3,7 @@ package sparse
 import (
 	"math"
 
-	"github.com/gonum/floats"
+	"gonum.org/v1/gonum/floats"
 	"gonum.org/v1/gonum/mat"
 )
 

compressed_test.go

@@ -3,7 +3,7 @@ package sparse
 import (
 	"testing"
 
-	"gonum.org/v1/gonum/floats"
+	"gonum.org/v1/gonum/floats/scalar"
 	"gonum.org/v1/gonum/mat"
 )
 
@@ -458,7 +458,7 @@ func TestCSTrace(t *testing.T) {
 		for i := 0; i < test.s; i++ {
 			checkTr += m.At(i, i)
 		}
-		if !floats.EqualWithinAbs(tr, checkTr, 1e-13) {
+		if !scalar.EqualWithinAbs(tr, checkTr, 1e-13) {
 			t.Logf("trace mismatch: %f vs %f", tr, checkTr)
 			t.Fail()
 		}

diagonal_test.go

@@ -3,7 +3,7 @@ package sparse
 import (
 	"testing"
 
-	"gonum.org/v1/gonum/floats"
+	"gonum.org/v1/gonum/floats/scalar"
 	"gonum.org/v1/gonum/mat"
 )
 
@@ -148,7 +148,7 @@ func TestDIATrace(t *testing.T) {
 		for i := 0; i < test.s; i++ {
 			checkTr += dia.At(i, i)
 		}
-		if !floats.EqualWithinAbs(tr, checkTr, 1e-13) {
+		if !scalar.EqualWithinAbs(tr, checkTr, 1e-13) {
 			t.Logf("trace mismatch: %f vs %f", tr, checkTr)
 			t.Fail()
 		}

go.mod

@@ -3,8 +3,6 @@ module github.com/james-bowman/sparse
 go 1.14
 
 require (
-	github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82
-	github.com/gonum/internal v0.0.0-20181124074243-f884aa714029 // indirect
 	golang.org/x/exp v0.0.0-20210220032938-85be41e4509f
 	gonum.org/v1/gonum v0.8.2
 )

go.sum

@@ -4,10 +4,6 @@ github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82 h1:EvokxLQsaaQjcWVWSV38221VAK7qc2zhaO17bKys/18=
-github.com/gonum/floats v0.0.0-20181209220543-c233463c7e82/go.mod h1:PxC8OnwL11+aosOB5+iEPoV3picfs8tUpkVd0pDo+Kg=
-github.com/gonum/internal v0.0.0-20181124074243-f884aa714029 h1:8jtTdc+Nfj9AR+0soOeia9UZSvYBvETVHZrugUowJ7M=
-github.com/gonum/internal v0.0.0-20181124074243-f884aa714029/go.mod h1:Pu4dmpkhSyOzRwuXkOgAvijx4o+4YMUJJo9OvPYMkks=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=