package/gonum
1
0
Fork 0
mirror of https://github.com/gonum/gonum.git synced 2025-10-06 07:37:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mat: relax list test type restrictions for Vector parameters

Browse Source
This commit is contained in:
Dan Kortschak
2017-12-27 19:24:49 +10:30
committed by GitHub
parent 6e57d606a5
commit cd47c93d54
4 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mat/list_test.go
View File

@@ -169,14 +169,20 @@ func legalTypesSym(a, b Matrix) bool {
return true return true
} }
// legalTypeVector returns whether v is a Vector.
func legalTypeVector(v Matrix) bool {
_, ok := v.(Vector)
return ok
}
// legalTypeVec returns whether v is a *VecDense. // legalTypeVec returns whether v is a *VecDense.
func legalTypeVec(v Matrix) bool { func legalTypeVecDense(v Matrix) bool {
_, ok := v.(*VecDense) _, ok := v.(*VecDense)
return ok return ok
} }
// legalTypesVecVec returns whether both inputs are Vector // legalTypesVectorVector returns whether both inputs are Vector
func legalTypesVecVec(a, b Matrix) bool { func legalTypesVectorVector(a, b Matrix) bool {
if _, ok := a.(Vector); !ok { if _, ok := a.(Vector); !ok {
return false return false
} }
@@ -197,9 +203,16 @@ func legalTypesVecDenseVecDense(a, b Matrix) bool {
return true return true
} }
// legalTypesNotVecVec returns whether the first input is an arbitrary Matrix // legalTypesMatrixVector returns whether the first input is an arbitrary Matrix
// and the second input is a Vector.
func legalTypesMatrixVector(a, b Matrix) bool {
_, ok := b.(Vector)
return ok
}
// legalTypesMatrixVecDense returns whether the first input is an arbitrary Matrix
// and the second input is a *VecDense. // and the second input is a *VecDense.
func legalTypesNotVecVec(a, b Matrix) bool { func legalTypesMatrixVecDense(a, b Matrix) bool {
_, ok := b.(*VecDense) _, ok := b.(*VecDense)
return ok return ok
} }

14
mat/matrix_test.go
View File

@@ -371,14 +371,18 @@ type basicVector struct {
m []float64 m []float64
} }
func (v *basicVector) AtVec(i int) float64 {
if i < 0 || i >= v.Len() {
panic(ErrRowAccess)
}
return v.m[i]
}
func (v *basicVector) At(r, c int) float64 { func (v *basicVector) At(r, c int) float64 {
if c != 0 { if c != 0 {
panic(ErrColAccess) panic(ErrColAccess)
} }
if r < 0 || r >= v.Len() { return v.AtVec(r)
panic(ErrRowAccess)
}
return v.m[r]
} }
func (v *basicVector) Dims() (r, c int) { func (v *basicVector) Dims() (r, c int) {
@@ -411,7 +415,7 @@ func TestDot(t *testing.T) {
} }
return sum return sum
} }
testTwoInputFunc(t, "Dot", f, denseComparison, sameAnswerFloatApproxTol(1e-12), legalTypesVecVec, legalSizeSameVec) testTwoInputFunc(t, "Dot", f, denseComparison, sameAnswerFloatApproxTol(1e-12), legalTypesVectorVector, legalSizeSameVec)
} }
func TestEqual(t *testing.T) { func TestEqual(t *testing.T) {

2
mat/solve_test.go
View File

@@ -293,5 +293,5 @@ func TestSolveVec(t *testing.T) {
denseComparison := func(receiver, a, b *Dense) { denseComparison := func(receiver, a, b *Dense) {
receiver.Solve(a, b) receiver.Solve(a, b)
} }
testTwoInput(t, "SolveVec", &VecDense{}, method, denseComparison, legalTypesNotVecVec, legalSizeSolve, 1e-12) testTwoInput(t, "SolveVec", &VecDense{}, method, denseComparison, legalTypesMatrixVecDense, legalSizeSolve, 1e-12)
} }

6
mat/vector_test.go
View File

@@ -201,7 +201,7 @@ func TestVecDenseMul(t *testing.T) {
} }
return legal return legal
} }
testTwoInput(t, "MulVec", &VecDense{}, method, denseComparison, legalTypesNotVecVec, legalSizeMulVec, 1e-14) testTwoInput(t, "MulVec", &VecDense{}, method, denseComparison, legalTypesMatrixVector, legalSizeMulVec, 1e-14)
} }
func TestVecDenseScale(t *testing.T) { func TestVecDenseScale(t *testing.T) {
@@ -274,7 +274,7 @@ func TestVecDenseScale(t *testing.T) {
denseComparison := func(receiver, a *Dense) { denseComparison := func(receiver, a *Dense) {
receiver.Scale(alpha, a) receiver.Scale(alpha, a)
} }
testOneInput(t, "ScaleVec", &VecDense{}, method, denseComparison, legalTypeVec, isAnyVecDense, 0) testOneInput(t, "ScaleVec", &VecDense{}, method, denseComparison, legalTypeVector, isAnyVecDense, 0)
} }
} }
@@ -292,7 +292,7 @@ func TestVecDenseAddScaled(t *testing.T) {
sb.Scale(alpha, b) sb.Scale(alpha, b)
receiver.Add(a, &sb) receiver.Add(a, &sb)
} }
testTwoInput(t, "AddScaledVec", &VecDense{}, method, denseComparison, legalTypesVecDenseVecDense, legalSizeSameVec, 1e-14) testTwoInput(t, "AddScaledVec", &VecDense{}, method, denseComparison, legalTypesVectorVector, legalSizeSameVec, 1e-14)
} }
} }