diff --git a/blas/native/general_double.go b/blas/native/general_double.go index 0fa6cb74..13ec338c 100644 --- a/blas/native/general_double.go +++ b/blas/native/general_double.go @@ -5,77 +5,15 @@ package native import ( - "errors" - "fmt" "math" ) -func newGeneral64(r, c int) general64 { - return general64{ - data: make([]float64, r*c), - rows: r, - cols: c, - stride: c, - } -} - type general64 struct { data []float64 rows, cols int stride int } -// adds element-wise into receiver. rows and columns must match -func (g general64) add(h general64) { - if debug { - if g.rows != h.rows { - panic("blas: row size mismatch") - } - if g.cols != h.cols { - panic("blas: col size mismatch") - } - } - for i := 0; i < g.rows; i++ { - gtmp := g.data[i*g.stride : i*g.stride+g.cols] - for j, v := range h.data[i*h.stride : i*h.stride+h.cols] { - gtmp[j] += v - } - } -} - -// at returns the value at the ith row and jth column. For speed reasons, the -// rows and columns are not bounds checked. -func (g general64) at(i, j int) float64 { - if debug { - if i < 0 || i >= g.rows { - panic("blas: row out of bounds") - } - if j < 0 || j >= g.cols { - panic("blas: col out of bounds") - } - } - return g.data[i*g.stride+j] -} - -func (g general64) check(c byte) error { - if g.rows < 0 { - return errors.New("blas: rows < 0") - } - if g.cols < 0 { - return errors.New("blas: cols < 0") - } - if g.stride < 1 { - return errors.New("blas: stride < 1") - } - if g.stride < g.cols { - return errors.New("blas: illegal stride") - } - if (g.rows-1)*g.stride+g.cols > len(g.data) { - return fmt.Errorf("blas: index of %c out of range", c) - } - return nil -} - func (g general64) clone() general64 { data := make([]float64, len(g.data)) copy(data, g.data) @@ -87,21 +25,6 @@ func (g general64) clone() general64 { } } -// assumes they are the same size -func (g general64) copy(h general64) { - if debug { - if g.rows != h.rows { - panic("blas: row mismatch") - } - if g.cols != h.cols { - panic("blas: col mismatch") - } - } - for k := 0; k < g.rows; k++ { - copy(g.data[k*g.stride:(k+1)*g.stride], h.data[k*h.stride:(k+1)*h.stride]) - } -} - func (g general64) equal(a general64) bool { if g.rows != a.rows || g.cols != a.cols || g.stride != a.stride { return false @@ -114,34 +37,6 @@ func (g general64) equal(a general64) bool { return true } -/* -// print is to aid debugging. Commented out to avoid fmt import -func (g general64) print() { - fmt.Println("r = ", g.rows, "c = ", g.cols, "stride: ", g.stride) - for i := 0; i < g.rows; i++ { - fmt.Println(g.data[i*g.stride : (i+1)*g.stride]) - } - -} -*/ - -func (g general64) view(i, j, r, c int) general64 { - if debug { - if i < 0 || i+r > g.rows { - panic("blas: row out of bounds") - } - if j < 0 || j+c > g.cols { - panic("blas: col out of bounds") - } - } - return general64{ - data: g.data[i*g.stride+j : (i+r-1)*g.stride+j+c], - rows: r, - cols: c, - stride: g.stride, - } -} - func (g general64) equalWithinAbs(a general64, tol float64) bool { if g.rows != a.rows || g.cols != a.cols || g.stride != a.stride { return false