diff --git a/README.md b/README.md index c0a16d3..9782459 100644 --- a/README.md +++ b/README.md @@ -418,8 +418,8 @@ func StringSlice(slice interface{}) []string //convert value to string slice func Unique(slice interface{}) interface{} //remove duplicate elements in slice func Union(slices ...interface{}) interface{} //Union creates a slice of unique values, in order, from all given slices. using == for equality comparisons. func UpdateByIndex(slice interface{}, index int, value interface{}) (interface{}, error) //update the slice element at index. -func Without(slice interface{}, values ...interface{}) interface{} //creates a slice excluding all given values -func GroupBy(slice, function interface{}) (interface{}, interface{}) // groups slice into two categories +func Without[T comparable](slice []T, values ...T) []T//creates a slice excluding all given values +func GroupBy[T any](slice []T, fn func(index int, t T) bool) ([]T, []T) // groups slice into two categories func Count[T any](slice []T, fn func(index int, t T) bool) int // Count iterates over elements of slice, returns a count of all matched elements ``` diff --git a/README_zh-CN.md b/README_zh-CN.md index ca085b1..751aa40 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -419,8 +419,8 @@ func StringSlice(slice interface{}) []string //转为string切片 func Unique(slice interface{}) interface{} //去重切片 func Union(slices ...interface{}) interface{} //slice并集, 去重 func UpdateByIndex(slice interface{}, index int, value interface{}) (interface{}, error) //在切片中index位置更新value -func Without(slice interface{}, values ...interface{}) interface{} //slice去除values -func GroupBy(slice, function interface{}) (interface{}, interface{}) //根据函数function的逻辑分slice为两组slice +func Without[T comparable](slice []T, values ...T) []T//slice去除values +func GroupBy[T any](slice []T, fn func(index int, t T) bool) ([]T, []T) //根据函数function的逻辑分slice为两组slice func Count[T any](slice []T, fn func(index int, t T) bool) int //遍历slice的元素,返回所有匹配元素的计数 ``` diff --git a/function/watcher_test.go b/function/watcher_test.go index f59772c..2660a29 100644 --- a/function/watcher_test.go +++ b/function/watcher_test.go @@ -24,7 +24,7 @@ func TestWatcher(t *testing.T) { assert.Equal(false, w.excuting) w.Reset() - + assert.Equal(int64(0), w.startTime) assert.Equal(int64(0), w.stopTime) } diff --git a/myconstraints/constraints.go b/myconstraints/constraints.go index eeca350..6e25096 100644 --- a/myconstraints/constraints.go +++ b/myconstraints/constraints.go @@ -1,6 +1,5 @@ package myconstraints - type Number interface { - int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64 | uintptr | float32 | float64 | complex64 | complex128 + int | int8 | int16 | int32 | int64 | uint | uint8 | uint16 | uint32 | uint64 | uintptr | float32 | float64 | complex64 | complex128 } diff --git a/slice/slice.go b/slice/slice.go index 59b2f2b..832af67 100644 --- a/slice/slice.go +++ b/slice/slice.go @@ -144,28 +144,29 @@ func Count[T any](slice []T, fn func(index int, t T) bool) int { // GroupBy iterate over elements of the slice, each element will be group by criteria, returns two slices // The function signature should be func(index int, value interface{}) bool . -func GroupBy(slice, function interface{}) (interface{}, interface{}) { - sv := sliceValue(slice) - fn := functionValue(function) +func GroupBy[T any](slice []T, fn func(index int, t T) bool) ([]T, []T) { - elemType := sv.Type().Elem() - if checkSliceCallbackFuncSignature(fn, elemType, reflect.ValueOf(true).Type()) { - panic("function param should be of type func(int, " + elemType.String() + ")" + reflect.ValueOf(true).Type().String()) + if fn == nil { + panic("fn is missing") } - groupB := reflect.MakeSlice(sv.Type(), 0, 0) - groupA := reflect.MakeSlice(sv.Type(), 0, 0) + if len(slice) == 0 { + return make([]T, 0), make([]T, 0) + } - for i := 0; i < sv.Len(); i++ { - flag := fn.Call([]reflect.Value{reflect.ValueOf(i), sv.Index(i)})[0] - if flag.Bool() { - groupA = reflect.Append(groupA, sv.Index(i)) + groupB := make([]T, 0) + groupA := make([]T, 0) + + for i, v := range slice { + ok := fn(i, v) + if ok { + groupA = append(groupA, v) } else { - groupB = reflect.Append(groupB, sv.Index(i)) + groupB = append(groupB, v) } } - return groupA.Interface(), groupB.Interface() + return groupA, groupB } // Find iterates over elements of slice, returning the first one that passes a truth test on function. @@ -587,24 +588,17 @@ func reverseSlice(slice interface{}) { } // Without creates a slice excluding all given values -func Without(slice interface{}, values ...interface{}) interface{} { - sv := sliceValue(slice) - if sv.Len() == 0 { +func Without[T comparable](slice []T, values ...T) []T { + if len(values) == 0 || len(slice) == 0 { return slice } - var indexes []int - for i := 0; i < sv.Len(); i++ { - v := sv.Index(i).Interface() + out := make([]T, 0, len(slice)) + for _, v := range slice { if !Contain(values, v) { - indexes = append(indexes, i) + out = append(out, v) } } - res := reflect.MakeSlice(sv.Type(), len(indexes), len(indexes)) - for i := range indexes { - res.Index(i).Set(sv.Index(indexes[i])) - } - - return res.Interface() + return out }