diff --git a/algorithms/avx2/vek.go b/algorithms/avx2/vek.go index 232bafc133cab2a916be695bb7670c0db96b976a..666ce1ae71f19943b7672683d5f2d9b06115f141 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 bcc5b53806e04a2d50b6e6ee938445718d60fbc5..f59e951f6fbd79ef04a3413c9f3cff3f087ab956 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 8cbb1205ded7e3dde9abaf3a7d446ff4dfe5cc08..d931b24d87f4d372016f9477e2aac3631e2cc45d 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 9784d53b18e2b7017847bfaab0a10b1c0f976914..599e328df5c17196247d9bf36b061aebb49cd7b0 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 f9ce1bfd7e98b610fbfd94c4c9325f4399c78a14..3987a7d6f2e567fb16c04c6e0bacda3e9bc73d05 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 92543410af065964f5fb97cd7d6e2cd86302df04..1d45c972b2c0cde634787866978e625d6a5e2db0 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 7aab7799a3f24d8c987d894cee2e1ad86d21ff82..03be3b84aa19deb2c4402be74721a7379dd8346c 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 264692be4ad474cfe476b055abdc91478f10804f..fe78e81f7d85156b1f94ece983640acc0c043dfe 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 2ff2504386395d3bde6156ac1b2145048fe8c131..1cf901ed84b475310e3a891cb8731e0a38fa0456 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 c8883044d9e276209ab1804e37d1b2f285c29d87..f854c72ec1d059c9fd5331ade37256be57e33553 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 509cce13ab30c4915095afca7162e28520eec4d5..256cd080dee3739a2ccdaf06ad4f8193003749d7 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 237f5c1e42189521665a71d47f596e373c1df1a7..8c3fbbfea2d019aa913798a14a3e5e00837d6d42 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 2942a6cfa7beceb3279ada4ee3b35f35533425f0..2f1bfeca506f7cbf44aae1e764f44433e01ce198 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 3eb415d5b8a1d2c70dd73c6cbaafbfbe7a6c632b..83a6564855c761abb7aee2a6adc3d1de4eeb2d92 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 f1ebb5ce3a0e4903dae55b45476f9807adb125d3..92709710afbdfb0d0d66c16acd333f6ef3c2a78b 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 3afbcbd1bf40461c89115282037df78ec5fdeb8d..5249dbd83e0fa7f3f05643ca84fd335cdaeef429 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 d8093324bd63409e57d9d4a553147a90c1810cc8..90ce67a99600b31537604e5f46a410a9af5804dd 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 bc2a429f9aae0cd3b7e6ace4d0172483d538093d..2c12d1a895c39dfbc47cfed59c58e11041aed998 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 bfb306134a90743313c0a51289394922910368bc..7558ddc044693e145ca1cc5f9d2dd0dda703a6c3 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 4b5a172a363092dfd693657cad4af17881949bc8..4d347111d761764f2d53c635b7d6493c1bd9d0b8 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 55c711242a0fb2e68f0be96bf2ebaba4c9079aee..1d87101b92e9e7e0445c5dffe630a379b6bbbc37 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 32f62508967dc7faff12d6d5e612abb39d9043ae..99298484af91e93d7353b2a1b9ef41c4db3cfa66 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 031dc2ca635fb7a0bc4e8410a7b9c29c24d7fb2b..40f6bcdf5af079420fa09ebe08eec07415409650 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 230732a69d0e565ea75b6996d2190353c32aeae9..5b1f6d332e5028bf4b5963145cefb59a67a30ecc 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 681644e02316c72f56b7b933f25405be3ac6ce66..8ceb9620dbc03e1dc4e8ba34021b35e60d8ad30f 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 e77bac22278d6af745478c256562e97bf81b8c00..977111761085c391c83cd47756616c9c6e6522dc 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 3fc34eb4e7fd8e531fd794ebc0ad21fafdee402c..775e8072ed024fde5819b46af27f35f2a75026e3 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 bb66cb8549bae388fcb3ec97f22763cb5f9de192..b5adbce3e330839641fbdc55366ef4b8b8deafe7 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 17f42e736621020602453d3986f42b5b58259ac4..5792fd0f62e8407ac1bb2f1b53a5be9fb4cca682 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 f6460020ea570527b6fb4b3f5cc2f9342b90fdba..49ea6508356048a6d26bbf953ec60c8b7737d07e 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/shift.go b/stat/shift.go index e214e2027f99aa1e04c1a9535ccdb43cb3935722..37863ceb9ea7794ee34c62c56cf4ff8aab76e6cd 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 diff --git a/stat/sqrt.go b/stat/sqrt.go index a64abf396cbfa586469661e68a76d26e5528e086..32b33265f6bcb57b809bd830443857551ec9284f 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 b43a9cfaa865d389a6491fba4f1949385323a290..8bb0018328e05304c218bf9842ccce6be166d7ef 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 fedd91fce83fda5fb8e19ecbae4a3aa7dcc67080..e1f9d66bf15d42b0a613681d9049837e31261c81 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 26bbf5e6a27997e6f1ab1d6d319424581861c420..14336e3a8800a513cb74311c0216c129e50a623e 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 1de6d5e6601e4ecab633a749082ec26430fca1c5..ef3e1d9667c7780a32e26c2c2efa71fb4cceb4d6 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 b56821ebcb6037f742ba663652746f608fd43351..d733b018a3f43b48b8489b1abb8fa8f339edb40d 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"