From 83464133eca04561c49b6f8acfc548d72e1b32b7 Mon Sep 17 00:00:00 2001 From: wangfeng Date: Wed, 8 Mar 2023 14:16:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E8=AE=A2SHIFT=E5=AF=B9N=E7=9A=84s?= =?UTF-8?q?eries=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stat/shift.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stat/shift.go b/stat/shift.go index e214e20..37863ce 100644 --- a/stat/shift.go +++ b/stat/shift.go @@ -13,6 +13,8 @@ func Shift[T BaseType](S []T, N any) []T { length := len(S) var _n []DType switch v := N.(type) { + case Series: + _n = v.DTypes() case int: if v == 0 { return S -- Gitee From 51841b151e1d523c95acb9192e157220c2629306 Mon Sep 17 00:00:00 2001 From: wangfeng Date: Wed, 8 Mar 2023 16:40:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E6=8C=81arm64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- algorithms/avx2/vek.go | 2 +- formula/comparison.go | 2 +- formula/cross.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- stat/abs.go | 4 ++-- stat/argmax.go | 4 ++-- stat/argmin.go | 4 ++-- stat/arithmetics_add.go | 4 ++-- stat/arithmetics_div.go | 4 ++-- stat/arithmetics_mul.go | 4 ++-- stat/arithmetics_sub.go | 4 ++-- stat/avx2.go | 2 +- stat/builtin.go | 2 +- stat/count.go | 2 +- stat/cumsum.go | 4 ++-- stat/logic.go | 4 ++-- stat/logic_all.go | 2 +- stat/logic_any.go | 2 +- stat/logic_equal.go | 4 ++-- stat/max.go | 4 ++-- stat/maximum.go | 4 ++-- stat/mean.go | 4 ++-- stat/min.go | 4 ++-- stat/minimum.go | 4 ++-- stat/ndarray_logic.go | 2 +- stat/polynomial.go | 2 +- stat/repeat.go | 4 ++-- stat/rolling_count.go | 2 +- stat/series_convert.go | 4 ++-- stat/sqrt.go | 4 ++-- stat/stddev.go | 4 ++-- stat/sum.go | 4 ++-- stat/type_dtype.go | 2 +- stat/type_float32.go | 2 +- stat/type_float64.go | 2 +- 36 files changed, 60 insertions(+), 60 deletions(-) diff --git a/algorithms/avx2/vek.go b/algorithms/avx2/vek.go index 232bafc..666ce1a 100644 --- a/algorithms/avx2/vek.go +++ b/algorithms/avx2/vek.go @@ -1,7 +1,7 @@ package avx2 // -//import "github.com/viterin/vek" +//import "gitee.com/quant1x/vek" // //// 初始化 avx2 //// 可以参考另一个实现库 gonum.org/v1/gonum/stat diff --git a/formula/comparison.go b/formula/comparison.go index bcc5b53..f59e951 100644 --- a/formula/comparison.go +++ b/formula/comparison.go @@ -2,8 +2,8 @@ package formula import ( "gitee.com/quant1x/pandas/stat" + "gitee.com/quant1x/vek" "github.com/mymmsc/gox/exception" - "github.com/viterin/vek" ) // EQ 相等 diff --git a/formula/cross.go b/formula/cross.go index 8cbb120..d931b24 100644 --- a/formula/cross.go +++ b/formula/cross.go @@ -2,7 +2,7 @@ package formula import ( "gitee.com/quant1x/pandas/stat" - "github.com/viterin/vek" + "gitee.com/quant1x/vek" ) // CROSS diff --git a/go.mod b/go.mod index 9784d53..599e328 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,8 @@ module gitee.com/quant1x/pandas go 1.20 require ( - gitee.com/quant1x/data v0.8.2 + gitee.com/quant1x/data v0.8.8 + gitee.com/quant1x/vek v0.5.3 github.com/chewxy/math32 v1.10.1 github.com/mymmsc/gox v1.3.9 github.com/olekukonko/tablewriter v0.0.5 @@ -11,7 +12,6 @@ require ( github.com/tealeg/xlsx v1.0.5 github.com/tealeg/xlsx/v3 v3.2.4 github.com/viterin/partial v1.0.0 - github.com/viterin/vek v0.4.0 golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0 gonum.org/v1/gonum v0.12.0 ) diff --git a/go.sum b/go.sum index f9ce1bf..3987a7d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,9 @@ -gitee.com/quant1x/data v0.8.2 h1:CE7TqjS5WE60NOWdl3rYSoxhDc7tdS+SQ3NJpeV56Mw= -gitee.com/quant1x/data v0.8.2/go.mod h1:S5tLicyK3DdPMAsBmF0fNQlPvVKk+xbpstolA/r9D8M= +gitee.com/quant1x/data v0.8.8 h1:lTRAthfZEtce4wpJbiAqWGfY8q94et1VXs3pDDyu4ok= +gitee.com/quant1x/data v0.8.8/go.mod h1:eWNzbwVPy5oBQgn+zGr0m6O27NyowkIhV0rEWGUEBf0= gitee.com/quant1x/gotdx v1.2.6 h1:iOVyDQcK5c4z5D6wfPKVIfdDZzjEUQv0xrRgBuvN2Xc= gitee.com/quant1x/gotdx v1.2.6/go.mod h1:lOJYzC4mcKmeHpm1L5jl94S0pPifue1sf9JMTP2kmho= +gitee.com/quant1x/vek v0.5.3 h1:NNRL580MuwD5L4ojkxpmrLISYrcV+oNW4V6OhTEucNc= +gitee.com/quant1x/vek v0.5.3/go.mod h1:nerKeY+oDgJOvZ0a6TV9GFMIX3P5VknNLzKXWr7uz7M= github.com/chewxy/math32 v1.10.1 h1:LFpeY0SLJXeaiej/eIp2L40VYfscTvKh/FSEZ68uMkU= github.com/chewxy/math32 v1.10.1/go.mod h1:dOB2rcuFrCn6UHrze36WSLVPKtzPMRAQvBvUwkSsLqs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -82,8 +84,6 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/viterin/partial v1.0.0 h1:e6z0cWJ+SddpXHoLU4ikIDrsI/ZE+p+hqMsB++8IfwE= github.com/viterin/partial v1.0.0/go.mod h1:K9y+kVePpmfZN510YNHoUs+6scZ2K7BLojfI8aW2nw0= -github.com/viterin/vek v0.4.0 h1:P34BWVGd3pSZFma9SE+G1pTucMGtw9p79I+Hull/+Ao= -github.com/viterin/vek v0.4.0/go.mod h1:hVXEX7pnI4acHRhtFhmuBapUxhQ3TetMEp68jjxExBs= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0 h1:17k44ji3KFYG94XS5QEFC8pyuOlMh3IoR+vkmTZmJJs= diff --git a/stat/abs.go b/stat/abs.go index 9254341..1d45c97 100644 --- a/stat/abs.go +++ b/stat/abs.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // Abs 泛型绝对值 diff --git a/stat/argmax.go b/stat/argmax.go index 7aab779..03be3b8 100644 --- a/stat/argmax.go +++ b/stat/argmax.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // ArgMax Returns the indices of the maximum values along an axis. diff --git a/stat/argmin.go b/stat/argmin.go index 264692b..fe78e81 100644 --- a/stat/argmin.go +++ b/stat/argmin.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // ArgMin Returns the indices of the minimum values along an axis. diff --git a/stat/arithmetics_add.go b/stat/arithmetics_add.go index 2ff2504..1cf901e 100644 --- a/stat/arithmetics_add.go +++ b/stat/arithmetics_add.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" ) diff --git a/stat/arithmetics_div.go b/stat/arithmetics_div.go index c888304..f854c72 100644 --- a/stat/arithmetics_div.go +++ b/stat/arithmetics_div.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" ) diff --git a/stat/arithmetics_mul.go b/stat/arithmetics_mul.go index 509cce1..256cd08 100644 --- a/stat/arithmetics_mul.go +++ b/stat/arithmetics_mul.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" ) diff --git a/stat/arithmetics_sub.go b/stat/arithmetics_sub.go index 237f5c1..8c3fbbf 100644 --- a/stat/arithmetics_sub.go +++ b/stat/arithmetics_sub.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" ) diff --git a/stat/avx2.go b/stat/avx2.go index 2942a6c..2f1bfec 100644 --- a/stat/avx2.go +++ b/stat/avx2.go @@ -1,6 +1,6 @@ package stat -import "github.com/viterin/vek" +import "gitee.com/quant1x/vek" // 初始化 avx2 // 可以参考另一个实现库 gonum.org/v1/gonum/stat diff --git a/stat/builtin.go b/stat/builtin.go index 3eb415d..83a6564 100644 --- a/stat/builtin.go +++ b/stat/builtin.go @@ -2,7 +2,7 @@ package stat import ( //gc "github.com/huandu/go-clone" - "github.com/viterin/vek" + "gitee.com/quant1x/vek" "math" "reflect" "strings" diff --git a/stat/count.go b/stat/count.go index f1ebb5c..9270971 100644 --- a/stat/count.go +++ b/stat/count.go @@ -1,6 +1,6 @@ package stat -import "github.com/viterin/vek" +import "gitee.com/quant1x/vek" // Count 统计 func Count[T Number | ~bool](x []T) int { diff --git a/stat/cumsum.go b/stat/cumsum.go index 3afbcbd..5249dbd 100644 --- a/stat/cumsum.go +++ b/stat/cumsum.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" ) diff --git a/stat/logic.go b/stat/logic.go index d809332..90ce67a 100644 --- a/stat/logic.go +++ b/stat/logic.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) func __compare[T ~[]E, E any](x T, y any, c int, comparator func(f1, f2 DType) bool) []bool { diff --git a/stat/logic_all.go b/stat/logic_all.go index bc2a429..2c12d1a 100644 --- a/stat/logic_all.go +++ b/stat/logic_all.go @@ -1,6 +1,6 @@ package stat -import "github.com/viterin/vek" +import "gitee.com/quant1x/vek" // All 全部为真 func All[T Number | ~bool](x []T) bool { diff --git a/stat/logic_any.go b/stat/logic_any.go index bfb3061..7558ddc 100644 --- a/stat/logic_any.go +++ b/stat/logic_any.go @@ -1,6 +1,6 @@ package stat -import "github.com/viterin/vek" +import "gitee.com/quant1x/vek" // Any 任意一个为真 func Any[T Number | ~bool](x []T) bool { diff --git a/stat/logic_equal.go b/stat/logic_equal.go index 4b5a172..4d34711 100644 --- a/stat/logic_equal.go +++ b/stat/logic_equal.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // Equal 比较相等 diff --git a/stat/max.go b/stat/max.go index 55c7112..1d87101 100644 --- a/stat/max.go +++ b/stat/max.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // Max 纵向计算x最大值 diff --git a/stat/maximum.go b/stat/maximum.go index 32f6250..9929848 100644 --- a/stat/maximum.go +++ b/stat/maximum.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" ) diff --git a/stat/mean.go b/stat/mean.go index 031dc2c..40f6bcd 100644 --- a/stat/mean.go +++ b/stat/mean.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // Mean 求均值 diff --git a/stat/min.go b/stat/min.go index 230732a..5b1f6d3 100644 --- a/stat/min.go +++ b/stat/min.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // Min 纵向计算x最小值 diff --git a/stat/minimum.go b/stat/minimum.go index 681644e..8ceb962 100644 --- a/stat/minimum.go +++ b/stat/minimum.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" ) diff --git a/stat/ndarray_logic.go b/stat/ndarray_logic.go index e77bac2..9771117 100644 --- a/stat/ndarray_logic.go +++ b/stat/ndarray_logic.go @@ -1,6 +1,6 @@ package stat -import "github.com/viterin/vek" +import "gitee.com/quant1x/vek" func (self NDArray[T]) Logic(f func(idx int, v any) bool) []bool { d := make([]bool, self.Len()) diff --git a/stat/polynomial.go b/stat/polynomial.go index 3fc34eb..775e807 100644 --- a/stat/polynomial.go +++ b/stat/polynomial.go @@ -1,7 +1,7 @@ package stat import ( - "github.com/viterin/vek" + "gitee.com/quant1x/vek" "math" ) diff --git a/stat/repeat.go b/stat/repeat.go index bb66cb8..b5adbce 100644 --- a/stat/repeat.go +++ b/stat/repeat.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // Repeat 构造n长度的f的泛型切片 diff --git a/stat/rolling_count.go b/stat/rolling_count.go index 17f42e7..5792fd0 100644 --- a/stat/rolling_count.go +++ b/stat/rolling_count.go @@ -1,7 +1,7 @@ package stat import ( - "github.com/viterin/vek" + "gitee.com/quant1x/vek" ) func (r RollingAndExpandingMixin) Count() (s Series) { diff --git a/stat/series_convert.go b/stat/series_convert.go index f646002..49ea650 100644 --- a/stat/series_convert.go +++ b/stat/series_convert.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // 这里做数组统一转换 diff --git a/stat/sqrt.go b/stat/sqrt.go index a64abf3..32b3326 100644 --- a/stat/sqrt.go +++ b/stat/sqrt.go @@ -1,9 +1,9 @@ package stat import ( + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "github.com/chewxy/math32" - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" "math" ) diff --git a/stat/stddev.go b/stat/stddev.go index b43a9cf..8bb0018 100644 --- a/stat/stddev.go +++ b/stat/stddev.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" "golang.org/x/exp/slices" "gonum.org/v1/gonum/stat" "math" diff --git a/stat/sum.go b/stat/sum.go index fedd91f..e1f9d66 100644 --- a/stat/sum.go +++ b/stat/sum.go @@ -1,8 +1,8 @@ package stat import ( - "github.com/viterin/vek" - "github.com/viterin/vek/vek32" + "gitee.com/quant1x/vek" + "gitee.com/quant1x/vek/vek32" ) // Sum 求和 diff --git a/stat/type_dtype.go b/stat/type_dtype.go index 26bbf5e..14336e3 100644 --- a/stat/type_dtype.go +++ b/stat/type_dtype.go @@ -1,7 +1,7 @@ package stat import ( - "github.com/viterin/vek" + "gitee.com/quant1x/vek" ) type DType = float64 diff --git a/stat/type_float32.go b/stat/type_float32.go index 1de6d5e..ef3e1d9 100644 --- a/stat/type_float32.go +++ b/stat/type_float32.go @@ -2,9 +2,9 @@ package stat import ( "fmt" + "gitee.com/quant1x/vek/vek32" "github.com/mymmsc/gox/exception" "github.com/mymmsc/gox/logger" - "github.com/viterin/vek/vek32" "math" "reflect" "strconv" diff --git a/stat/type_float64.go b/stat/type_float64.go index b56821e..d733b01 100644 --- a/stat/type_float64.go +++ b/stat/type_float64.go @@ -2,9 +2,9 @@ package stat import ( "fmt" + "gitee.com/quant1x/vek" "github.com/mymmsc/gox/exception" "github.com/mymmsc/gox/logger" - "github.com/viterin/vek" "math" "reflect" "strconv" -- Gitee