sort_int恢复成主库代码

g/container/garray/garray_sorted_int.go

@@ -7,287 +7,286 @@
 package garray
 
 import (
-	"bytes"
+    "bytes"
 	"fmt"
 	"github.com/gogf/gf/g/container/gtype"
-	"github.com/gogf/gf/g/internal/rwmutex"
-	"github.com/gogf/gf/g/util/gconv"
-	"github.com/gogf/gf/g/util/grand"
-	"math"
-	"sort"
+    "github.com/gogf/gf/g/internal/rwmutex"
+    "github.com/gogf/gf/g/util/gconv"
+    "github.com/gogf/gf/g/util/grand"
+    "math"
+    "sort"
 )
 
 // It's using increasing order in default.
 type SortedIntArray struct {
-	mu         *rwmutex.RWMutex
-	array      []int
-	unique     *gtype.Bool          // Whether enable unique feature(false)
-	comparator func(v1, v2 int) int // Comparison function(it returns -1: v1 < v2; 0: v1 == v2; 1: v1 > v2)
+    mu          *rwmutex.RWMutex
+    array       []int
+    unique      *gtype.Bool          // Whether enable unique feature(false)
+    comparator func(v1, v2 int) int // Comparison function(it returns -1: v1 < v2; 0: v1 == v2; 1: v1 > v2)
 }
 
 // NewSortedIntArray creates and returns an empty sorted array.
 // The param <unsafe> used to specify whether using array in un-concurrent-safety,
 // which is false in default.
-func NewSortedIntArray(unsafe ...bool) *SortedIntArray {
-	return NewSortedIntArraySize(0, unsafe...)
+func NewSortedIntArray(unsafe...bool) *SortedIntArray {
+    return NewSortedIntArraySize(0, unsafe...)
 }
 
 // NewSortedIntArraySize create and returns an sorted array with given size and cap.
 // The param <unsafe> used to specify whether using array in un-concurrent-safety,
 // which is false in default.
-func NewSortedIntArraySize(cap int, unsafe ...bool) *SortedIntArray {
-	return &SortedIntArray{
-		mu:     rwmutex.New(unsafe...),
-		array:  make([]int, 0, cap),
-		unique: gtype.NewBool(),
-		comparator: func(v1, v2 int) int {
-			if v1 < v2 {
-				return -1
-			}
-			if v1 > v2 {
-				return 1
-			}
-			return 0
-		},
-	}
+func NewSortedIntArraySize(cap int, unsafe...bool) *SortedIntArray {
+    return &SortedIntArray {
+        mu          : rwmutex.New(unsafe...),
+        array       : make([]int, 0, cap),
+        unique      : gtype.NewBool(),
+        comparator : func(v1, v2 int) int {
+            if v1 < v2 {
+                return -1
+            }
+            if v1 > v2 {
+                return 1
+            }
+            return 0
+        },
+    }
 }
 
 // NewIntArrayFrom creates and returns an sorted array with given slice <array>.
 // The param <unsafe> used to specify whether using array in un-concurrent-safety,
 // which is false in default.
-func NewSortedIntArrayFrom(array []int, unsafe ...bool) *SortedIntArray {
-	a := NewSortedIntArraySize(0, unsafe...)
-	a.array = array
-	sort.Ints(a.array)
-	return a
+func NewSortedIntArrayFrom(array []int, unsafe...bool) *SortedIntArray {
+    a := NewSortedIntArraySize(0, unsafe...)
+    a.array = array
+    sort.Ints(a.array)
+    return a
 }
 
 // NewSortedIntArrayFromCopy creates and returns an sorted array from a copy of given slice <array>.
 // The param <unsafe> used to specify whether using array in un-concurrent-safety,
 // which is false in default.
-
-func NewSortedIntArrayFromCopy(array []int, unsafe ...bool) *SortedIntArray {
-	newArray := make([]int, len(array))
-	copy(newArray, array)
-	return NewSortedIntArrayFrom(newArray, unsafe...)
+func NewSortedIntArrayFromCopy(array []int, unsafe...bool) *SortedIntArray {
+    newArray := make([]int, len(array))
+    copy(newArray, array)
+    return NewSortedIntArrayFrom(newArray, unsafe...)
 }
 
 // SetArray sets the underlying slice array with the given <array>.
 func (a *SortedIntArray) SetArray(array []int) *SortedIntArray {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	a.array = array
-	sort.Ints(a.array)
-	return a
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    a.array = array
+    sort.Ints(a.array)
+    return a
 }
 
 // Sort sorts the array in increasing order.
 // The param <reverse> controls whether sort
 // in increasing order(default) or decreasing order.
 func (a *SortedIntArray) Sort() *SortedIntArray {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	sort.Ints(a.array)
-	return a
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    sort.Ints(a.array)
+    return a
 }
 
 // Add adds one or multiple values to sorted array, the array always keeps sorted.
-func (a *SortedIntArray) Add(values ...int) *SortedIntArray {
-	if len(values) == 0 {
-		return a
-	}
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	for _, value := range values {
-		index, cmp := a.binSearch(value, false)
-		if a.unique.Val() && cmp == 0 {
-			continue
-		}
-		if index < 0 {
-			a.array = append(a.array, value)
-			continue
-		}
-		if cmp > 0 {
-			index++
-		}
-		rear := append([]int{}, a.array[index:]...)
-		a.array = append(a.array[0:index], value)
-		a.array = append(a.array, rear...)
-	}
-	return a
+func (a *SortedIntArray) Add(values...int) *SortedIntArray {
+    if len(values) == 0 {
+        return a
+    }
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    for _, value := range values {
+        index, cmp := a.binSearch(value, false)
+        if a.unique.Val() && cmp == 0 {
+            continue
+        }
+        if index < 0 {
+            a.array = append(a.array, value)
+            continue
+        }
+        if cmp > 0 {
+            index++
+        }
+        rear   := append([]int{}, a.array[index : ]...)
+        a.array = append(a.array[0 : index], value)
+        a.array = append(a.array, rear...)
+    }
+    return a
 }
 
 // Get returns the value of the specified index,
 // the caller should notice the boundary of the array.
 func (a *SortedIntArray) Get(index int) int {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	value := a.array[index]
-	return value
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    value := a.array[index]
+    return value
 }
 
 // Remove removes an item by index.
 func (a *SortedIntArray) Remove(index int) int {
-	a.mu.Lock()
-	defer a.mu.Unlock()
+    a.mu.Lock()
+    defer a.mu.Unlock()
 	// Determine array boundaries when deleting to improve deletion efficiency.
-	if index == 0 {
-		value := a.array[0]
-		a.array = a.array[1:]
-		return value
-	} else if index == len(a.array)-1 {
-		value := a.array[index]
-		a.array = a.array[:index]
-		return value
-	}
+    if index == 0 {
+        value  := a.array[0]
+        a.array = a.array[1 : ]
+        return value
+    } else if index == len(a.array) - 1 {
+        value  := a.array[index]
+        a.array = a.array[: index]
+        return value
+    }
 	// If it is a non-boundary delete,
 	// it will involve the creation of an array,
 	// then the deletion is less efficient.
-	value := a.array[index]
-	a.array = append(a.array[:index], a.array[index+1:]...)
-	return value
+    value  := a.array[index]
+    a.array = append(a.array[ : index], a.array[index + 1 : ]...)
+    return value
 }
 
 // PopLeft pops and returns an item from the beginning of array.
 func (a *SortedIntArray) PopLeft() int {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	value := a.array[0]
-	a.array = a.array[1:]
-	return value
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    value  := a.array[0]
+    a.array = a.array[1 : ]
+    return value
 }
 
 // PopRight pops and returns an item from the end of array.
 func (a *SortedIntArray) PopRight() int {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	index := len(a.array) - 1
-	value := a.array[index]
-	a.array = a.array[:index]
-	return value
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    index  := len(a.array) - 1
+    value  := a.array[index]
+    a.array = a.array[: index]
+    return value
 }
 
 // PopRand randomly pops and return an item out of array.
 func (a *SortedIntArray) PopRand() int {
-	return a.Remove(grand.Intn(len(a.array)))
+    return a.Remove(grand.Intn(len(a.array)))
 }
 
 // PopRands randomly pops and returns <size> items out of array.
 func (a *SortedIntArray) PopRands(size int) []int {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	if size > len(a.array) {
-		size = len(a.array)
-	}
-	array := make([]int, size)
-	for i := 0; i < size; i++ {
-		index := grand.Intn(len(a.array))
-		array[i] = a.array[index]
-		a.array = append(a.array[:index], a.array[index+1:]...)
-	}
-	return array
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    array := make([]int, size)
+    for i := 0; i < size; i++ {
+        index   := grand.Intn(len(a.array))
+        array[i] = a.array[index]
+        a.array  = append(a.array[ : index], a.array[index + 1 : ]...)
+    }
+    return array
 }
 
 // PopLefts pops and returns <size> items from the beginning of array.
 func (a *SortedIntArray) PopLefts(size int) []int {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	length := len(a.array)
-	if size > length {
-		size = length
-	}
-	value := a.array[0:size]
-	a.array = a.array[size:]
-	return value
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    length := len(a.array)
+    if size > length {
+        size = length
+    }
+    value  := a.array[0 : size]
+    a.array = a.array[size : ]
+    return value
 }
 
 // PopRights pops and returns <size> items from the end of array.
 func (a *SortedIntArray) PopRights(size int) []int {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	index := len(a.array) - size
-	if index < 0 {
-		index = 0
-	}
-	value := a.array[index:]
-	a.array = a.array[:index]
-	return value
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    index := len(a.array) - size
+    if index < 0 {
+        index = 0
+    }
+    value  := a.array[index :]
+    a.array = a.array[ : index]
+    return value
 }
 
 // Range picks and returns items by range, like array[start:end].
 // Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
 func (a *SortedIntArray) Range(start, end int) []int {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	length := len(a.array)
-	if start > length || start > end {
-		return nil
-	}
-	if start < 0 {
-		start = 0
-	}
-	if end > length {
-		end = length
-	}
-	array := ([]int)(nil)
-	if a.mu.IsSafe() {
-		a.mu.RLock()
-		defer a.mu.RUnlock()
-		array = make([]int, end-start)
-		copy(array, a.array[start:end])
-	} else {
-		array = a.array[start:end]
-	}
-	return array
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    length := len(a.array)
+    if start > length || start > end {
+        return nil
+    }
+    if start < 0 {
+        start = 0
+    }
+    if end > length {
+        end = length
+    }
+    array  := ([]int)(nil)
+    if a.mu.IsSafe() {
+        a.mu.RLock()
+        defer a.mu.RUnlock()
+        array = make([]int, end - start)
+        copy(array, a.array[start : end])
+    } else {
+        array = a.array[start : end]
+    }
+    return array
 }
 
 // Len returns the length of array.
 func (a *SortedIntArray) Len() int {
-	a.mu.RLock()
-	length := len(a.array)
-	a.mu.RUnlock()
-	return length
+    a.mu.RLock()
+    length := len(a.array)
+    a.mu.RUnlock()
+    return length
 }
 
 // Sum returns the sum of values in an array.
 func (a *SortedIntArray) Sum() (sum int) {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	for _, v := range a.array {
-		sum += v
-	}
-	return
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    for _, v := range a.array {
+        sum += v
+    }
+    return
 }
 
 // Slice returns the underlying data of array.
 // Notice, if in concurrent-safe usage, it returns a copy of slice;
 // else a pointer to the underlying data.
 func (a *SortedIntArray) Slice() []int {
-	array := ([]int)(nil)
-	if a.mu.IsSafe() {
-		a.mu.RLock()
-		defer a.mu.RUnlock()
-		array = make([]int, len(a.array))
-		copy(array, a.array)
-	} else {
-		array = a.array
-	}
-	return array
+    array := ([]int)(nil)
+    if a.mu.IsSafe() {
+        a.mu.RLock()
+        defer a.mu.RUnlock()
+        array = make([]int, len(a.array))
+        copy(array, a.array)
+    } else {
+        array = a.array
+    }
+    return array
 }
 
 // Contains checks whether a value exists in the array.
 func (a *SortedIntArray) Contains(value int) bool {
-	return a.Search(value) != -1
+    return a.Search(value) != -1
 }
 
 // Search searches array by <value>, returns the index of <value>,
 // or returns -1 if not exists.
 func (a *SortedIntArray) Search(value int) (index int) {
-	if i, r := a.binSearch(value, true); r == 0 {
-		return i
-	}
-	return -1
+    if i, r := a.binSearch(value, true); r == 0 {
+    	return i
+    }
+    return -1
 }
 
 // Binary search.
@@ -296,95 +295,93 @@ func (a *SortedIntArray) Search(value int) (index int) {
 // If <result> lesser than 0, it means the value at <index> is lesser than <value>.
 // If <result> greater than 0, it means the value at <index> is greater than <value>.
 func (a *SortedIntArray) binSearch(value int, lock bool) (index int, result int) {
-	if len(a.array) == 0 {
-		return -1, -2
-	}
-	if lock {
-		a.mu.RLock()
-		defer a.mu.RUnlock()
-	}
-	min := 0
-	max := len(a.array) - 1
-	mid := 0
-	cmp := -2
-	for min <= max {
-		mid = int((min + max) / 2)
-		cmp = a.comparator(value, a.array[mid])
-		switch {
-		case cmp < 0:
-			max = mid - 1
-		case cmp > 0:
-			min = mid + 1
-		default:
-			return mid, cmp
-		}
-	}
-	return mid, cmp
+    if len(a.array) == 0 {
+        return -1, -2
+    }
+    if lock {
+        a.mu.RLock()
+        defer a.mu.RUnlock()
+    }
+    min := 0
+    max := len(a.array) - 1
+    mid := 0
+    cmp := -2
+    for min <= max {
+        mid = int((min + max) / 2)
+        cmp = a.comparator(value, a.array[mid])
+        switch {
+            case cmp < 0 : max = mid - 1
+            case cmp > 0 : min = mid + 1
+            default :
+                return mid, cmp
+        }
+    }
+    return mid, cmp
 }
 
 // SetUnique sets unique mark to the array,
 // which means it does not contain any repeated items.
 // It also do unique check, remove all repeated items.
 func (a *SortedIntArray) SetUnique(unique bool) *SortedIntArray {
-	oldUnique := a.unique.Val()
-	a.unique.Set(unique)
-	if unique && oldUnique != unique {
-		a.Unique()
-	}
-	return a
+    oldUnique := a.unique.Val()
+    a.unique.Set(unique)
+    if unique && oldUnique != unique {
+        a.Unique()
+    }
+    return a
 }
 
 // Unique uniques the array, clear repeated items.
 func (a *SortedIntArray) Unique() *SortedIntArray {
-	a.mu.Lock()
-	i := 0
-	for {
-		if i == len(a.array)-1 {
-			break
-		}
-		if a.comparator(a.array[i], a.array[i+1]) == 0 {
-			a.array = append(a.array[:i+1], a.array[i+1+1:]...)
-		} else {
-			i++
-		}
-	}
-	a.mu.Unlock()
-	return a
+    a.mu.Lock()
+    i := 0
+    for {
+        if i == len(a.array) - 1 {
+            break
+        }
+        if a.comparator(a.array[i], a.array[i + 1]) == 0 {
+            a.array = append(a.array[ : i + 1], a.array[i + 1 + 1 : ]...)
+        } else {
+            i++
+        }
+    }
+    a.mu.Unlock()
+    return a
 }
 
 // Clone returns a new array, which is a copy of current array.
 func (a *SortedIntArray) Clone() (newArray *SortedIntArray) {
-	a.mu.RLock()
-	array := make([]int, len(a.array))
-	copy(array, a.array)
-	a.mu.RUnlock()
-	return NewSortedIntArrayFrom(array, !a.mu.IsSafe())
+    a.mu.RLock()
+    array := make([]int, len(a.array))
+    copy(array, a.array)
+    a.mu.RUnlock()
+    return NewSortedIntArrayFrom(array, !a.mu.IsSafe())
 }
 
 // Clear deletes all items of current array.
 func (a *SortedIntArray) Clear() *SortedIntArray {
-	a.mu.Lock()
-	if len(a.array) > 0 {
-		a.array = make([]int, 0)
-	}
-	a.mu.Unlock()
-	return a
+    a.mu.Lock()
+    if len(a.array) > 0 {
+        a.array = make([]int, 0)
+    }
+    a.mu.Unlock()
+    return a
 }
 
 // LockFunc locks writing by callback function <f>.
 func (a *SortedIntArray) LockFunc(f func(array []int)) *SortedIntArray {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	f(a.array)
-	return a
+    a.mu.Lock()
+    defer a.mu.Unlock()
+    f(a.array)
+    return a
 }
 
 // RLockFunc locks reading by callback function <f>.
 func (a *SortedIntArray) RLockFunc(f func(array []int)) *SortedIntArray {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	f(a.array)
-	return a
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    f(a.array)
+    return a
 }
 
 // Merge merges <array> into current array.
@@ -392,105 +389,99 @@ func (a *SortedIntArray) RLockFunc(f func(array []int)) *SortedIntArray {
 // The difference between Merge and Append is Append supports only specified slice type,
 // but Merge supports more parameter types.
 func (a *SortedIntArray) Merge(array interface{}) *SortedIntArray {
-	switch v := array.(type) {
-	case *Array:
-		a.Add(gconv.Ints(v.Slice())...)
-	case *IntArray:
-		a.Add(gconv.Ints(v.Slice())...)
-	case *StringArray:
-		a.Add(gconv.Ints(v.Slice())...)
-	case *SortedArray:
-		a.Add(gconv.Ints(v.Slice())...)
-	case *SortedIntArray:
-		a.Add(gconv.Ints(v.Slice())...)
-	case *SortedStringArray:
-		a.Add(gconv.Ints(v.Slice())...)
-	default:
-		a.Add(gconv.Ints(array)...)
-	}
-	return a
+    switch v := array.(type) {
+        case *Array:             a.Add(gconv.Ints(v.Slice())...)
+        case *IntArray:          a.Add(gconv.Ints(v.Slice())...)
+        case *StringArray:       a.Add(gconv.Ints(v.Slice())...)
+        case *SortedArray:       a.Add(gconv.Ints(v.Slice())...)
+        case *SortedIntArray:    a.Add(gconv.Ints(v.Slice())...)
+        case *SortedStringArray: a.Add(gconv.Ints(v.Slice())...)
+        default:
+            a.Add(gconv.Ints(array)...)
+    }
+    return a
 }
 
 // Chunk splits an array into multiple arrays,
 // the size of each array is determined by <size>.
 // The last chunk may contain less than size elements.
 func (a *SortedIntArray) Chunk(size int) [][]int {
-	if size < 1 {
-		return nil
-	}
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	length := len(a.array)
-	chunks := int(math.Ceil(float64(length) / float64(size)))
-	var n [][]int
-	for i, end := 0, 0; chunks > 0; chunks-- {
-		end = (i + 1) * size
-		if end > length {
-			end = length
-		}
-		n = append(n, a.array[i*size:end])
-		i++
-	}
-	return n
+    if size < 1 {
+        return nil
+    }
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    length := len(a.array)
+    chunks := int(math.Ceil(float64(length) / float64(size)))
+    var n [][]int
+    for i, end := 0, 0; chunks > 0; chunks-- {
+        end = (i + 1) * size
+        if end > length {
+            end = length
+        }
+        n = append(n, a.array[i*size : end])
+        i++
+    }
+    return n
 }
 
 // SubSlice returns a slice of elements from the array as specified
 // by the <offset> and <size> parameters.
 // If in concurrent safe usage, it returns a copy of the slice; else a pointer.
 func (a *SortedIntArray) SubSlice(offset, size int) []int {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	if offset > len(a.array) {
-		return nil
-	}
-	if offset+size > len(a.array) {
-		size = len(a.array) - offset
-	}
-	if a.mu.IsSafe() {
-		s := make([]int, size)
-		copy(s, a.array[offset:])
-		return s
-	} else {
-		return a.array[offset:]
-	}
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    if offset > len(a.array) {
+        return nil
+    }
+    if offset + size > len(a.array) {
+        size = len(a.array) - offset
+    }
+    if a.mu.IsSafe() {
+        s := make([]int, size)
+        copy(s, a.array[offset:])
+        return s
+    } else {
+        return a.array[offset:]
+    }
 }
 
 // Rand randomly returns one item from array(no deleting).
 func (a *SortedIntArray) Rand() int {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	return a.array[grand.Intn(len(a.array))]
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    return a.array[grand.Intn(len(a.array))]
 }
 
 // Rands randomly returns <size> items from array(no deleting).
 func (a *SortedIntArray) Rands(size int) []int {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	if size > len(a.array) {
-		size = len(a.array)
-	}
-	n := make([]int, size)
-	for i, v := range grand.Perm(len(a.array)) {
-		n[i] = a.array[v]
-		if i == size-1 {
-			break
-		}
-	}
-	return n
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    if size > len(a.array) {
+        size = len(a.array)
+    }
+    n := make([]int, size)
+    for i, v := range grand.Perm(len(a.array)) {
+        n[i] = a.array[v]
+        if i == size - 1 {
+            break
+        }
+    }
+    return n
 }
 
 // Join joins array elements with a string <glue>.
 func (a *SortedIntArray) Join(glue string) string {
-	a.mu.RLock()
-	defer a.mu.RUnlock()
-	buffer := bytes.NewBuffer(nil)
-	for k, v := range a.array {
-		buffer.WriteString(gconv.String(v))
-		if k != len(a.array)-1 {
-			buffer.WriteString(glue)
-		}
-	}
-	return buffer.String()
+    a.mu.RLock()
+    defer a.mu.RUnlock()
+    buffer := bytes.NewBuffer(nil)
+    for k, v := range a.array {
+        buffer.WriteString(gconv.String(v))
+        if k != len(a.array) - 1 {
+            buffer.WriteString(glue)
+        }
+    }
+    return buffer.String()
 }
 
 // CountValues counts the number of occurrences of all values in the array.
@@ -509,4 +500,4 @@ func (a *SortedIntArray) String() string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
 	return fmt.Sprint(a.array)
-}
+}