update to use cmp.Ordered

howz97 · howz97 · commit 7ba2a531169f · 2024-06-10T16:18:04.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,2 @@
 .vscode
 .idea
-rust/target
-strings/sort/*.txt
-tmp.txt
diff --git a/go.mod b/go.mod
@@ -5,6 +5,5 @@ go 1.21
 require github.com/waiyva/binary-tree v1.0.0
 
 require (
-	golang.org/x/exp v0.0.0-20220407100705-7b9b53b0aca4 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/sort/bubble.go b/sort/bubble.go
@@ -14,9 +14,9 @@
 
 package sort
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
-func Bubble[Ord constraints.Ordered](data []Ord) {
+func Bubble[Ord cmp.Ordered](data []Ord) {
 	for i := len(data) - 1; i > 0; i-- {
 		for j := 0; j < i; j++ {
 			if data[j] > data[j+1] {
diff --git a/sort/heap.go b/sort/heap.go
@@ -14,9 +14,9 @@
 
 package sort
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
-func Heap[Ord constraints.Ordered](data []Ord) {
+func Heap[Ord cmp.Ordered](data []Ord) {
 	// construct big top heap
 	// leaf do not need to sink
 	for i := (len(data) - 2) / 2; i >= 0; i-- {
@@ -30,7 +30,7 @@ func Heap[Ord constraints.Ordered](data []Ord) {
 }
 
 // big top heap
-func percolateDown[Ord constraints.Ordered](h []Ord, i int) {
+func percolateDown[Ord cmp.Ordered](h []Ord, i int) {
 	k := h[i]
 	cavIdx := i
 	for {
diff --git a/sort/insert.go b/sort/insert.go
@@ -14,9 +14,9 @@
 
 package sort
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
-func Insert[Ord constraints.Ordered](data []Ord) {
+func Insert[Ord cmp.Ordered](data []Ord) {
 	for i := 1; i < len(data); i++ {
 		insrtNum := data[i]
 		j := i - 1
diff --git a/sort/merge.go b/sort/merge.go
@@ -14,14 +14,14 @@
 
 package sort
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
-func Merge[Ord constraints.Ordered](data []Ord) {
+func Merge[Ord cmp.Ordered](data []Ord) {
 	aux := make([]Ord, len(data))
 	mergeSort(data, aux)
 }
 
-func mergeSort[Ord constraints.Ordered](data []Ord, aux []Ord) {
+func mergeSort[Ord cmp.Ordered](data []Ord, aux []Ord) {
 	if len(data) < 2 {
 		return
 	}
@@ -31,7 +31,7 @@ func mergeSort[Ord constraints.Ordered](data []Ord, aux []Ord) {
 	merge(data, mid, aux)
 }
 
-func merge[Ord constraints.Ordered](data []Ord, mid int, aux []Ord) {
+func merge[Ord cmp.Ordered](data []Ord, mid int, aux []Ord) {
 	i, j, k := 0, mid, 0
 	for i < mid && j < len(data) {
 		if data[i] < data[j] {
diff --git a/sort/quick.go b/sort/quick.go
@@ -14,13 +14,13 @@
 
 package sort
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
-func Quick[Ord constraints.Ordered](data []Ord) {
+func Quick[Ord cmp.Ordered](data []Ord) {
 	quickSort(data, 0, len(data)-1)
 }
 
-func quickSort[Ord constraints.Ordered](data []Ord, lo, hi int) {
+func quickSort[Ord cmp.Ordered](data []Ord, lo, hi int) {
 	if hi <= lo {
 		return
 	}
@@ -37,7 +37,7 @@ func quickSort[Ord constraints.Ordered](data []Ord, lo, hi int) {
 }
 
 // 把 data[0] data[len(data)/2] data[len(data)-1] 中的中位数（枢纽元）交换到data[len(data)-1]
-func median2end[Ord constraints.Ordered](data []Ord, lo, hi int) {
+func median2end[Ord cmp.Ordered](data []Ord, lo, hi int) {
 	m := int(uint(lo+hi) >> 1)
 	if data[m] < data[lo] {
 		data[m], data[lo] = data[lo], data[m]
@@ -52,7 +52,7 @@ func median2end[Ord constraints.Ordered](data []Ord, lo, hi int) {
 }
 
 // 此时枢纽元在 data[len(data)-1] , 开始分割data[:len(data)-1], 并将枢纽元交换到i最终位置
-func cutOff[Ord constraints.Ordered](data []Ord, lo, hi int) int {
+func cutOff[Ord cmp.Ordered](data []Ord, lo, hi int) int {
 	i, j := lo, hi-1
 	for i <= j {
 		for i <= hi && data[i] < data[hi] {
diff --git a/sort/select.go b/sort/select.go
@@ -14,9 +14,9 @@
 
 package sort
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
-func Select[Ord constraints.Ordered](data []Ord) {
+func Select[Ord cmp.Ordered](data []Ord) {
 	for i := 0; i < len(data)-1; i++ {
 		idxMin := i
 		for j := i + 1; j < len(data); j++ {
diff --git a/sort/shell.go b/sort/shell.go
@@ -14,9 +14,9 @@
 
 package sort
 
-import "golang.org/x/exp/constraints"
+import "cmp"
 
-func Shell[Ord constraints.Ordered](data []Ord) {
+func Shell[Ord cmp.Ordered](data []Ord) {
 	// shell increment
 	for incre := len(data) >> 1; incre > 1; incre >>= 1 {
 		// sort $incre arries with interval of $incre in one loop
diff --git a/util/util.go b/util/util.go
@@ -16,16 +16,14 @@ package util
 
 import (
 	"bufio"
-	"io/ioutil"
+	"cmp"
 	"os"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/constraints"
 )
 
 func ReadAllLines(filename string) []string {
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filename)
 	if err != nil {
 		panic(err)
 	}
@@ -86,7 +84,7 @@ func MaxInt8(a, b int8) int8 {
 	return b
 }
 
-func Max[Ord constraints.Ordered](a, b Ord) Ord {
+func Max[Ord cmp.Ordered](a, b Ord) Ord {
 	if a > b {
 		return a
 	}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,5 @@ go 1.21`
`5`	`5`	`require github.com/waiyva/binary-tree v1.0.0`
`6`	`6`
`7`	`7`	`require (`
`8`		`- golang.org/x/exp v0.0.0-20220407100705-7b9b53b0aca4 // indirect`
`9`	`8`	`gopkg.in/yaml.v2 v2.4.0 // indirect`
`10`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,16 +16,14 @@ package util`
`16`	`16`
`17`	`17`	`import (`
`18`	`18`	`"bufio"`
`19`		`- "io/ioutil"`
	`19`	`+ "cmp"`
`20`	`20`	`"os"`
`21`	`21`	`"strings"`
`22`	`22`	`"time"`
`23`		`-`
`24`		`- "golang.org/x/exp/constraints"`
`25`	`23`	`)`
`26`	`24`
`27`	`25`	`func ReadAllLines(filename string) []string {`
`28`		`- content, err := ioutil.ReadFile(filename)`
	`26`	`+ content, err := os.ReadFile(filename)`
`29`	`27`	`if err != nil {`
`30`	`28`	`panic(err)`
`31`	`29`	`}`
`@@ -86,7 +84,7 @@ func MaxInt8(a, b int8) int8 {`
`86`	`84`	`return b`
`87`	`85`	`}`
`88`	`86`
`89`		`-func Max[Ord constraints.Ordered](a, b Ord) Ord {`
	`87`	`+func Max[Ord cmp.Ordered](a, b Ord) Ord {`
`90`	`88`	`if a > b {`
`91`	`89`	`return a`
`92`	`90`	`}`