Merge pull request #2 from golang-infrastructure/fix-#1

fix:#1

Author: CC11001100

fisher_yates_knuth_shuffle.go

@@ -18,11 +18,9 @@ func FisherYatesKnuthShuffle[T any](slice []T) {
 
 // FisherYatesShuffleMatrix Fisher–Yates-Knuth shuffle算法对矩阵洗牌
 func FisherYatesShuffleMatrix[T any](matrix [][]T) {
-	for i := len(matrix) - 1; i >= 0; i-- {
-		for j := len(matrix[i]) - 1; j >= 0; j-- {
-			chooseI := standaloneRand.Intn(i + 1)
-			chooseJ := standaloneRand.Intn(j + 1)
-			matrix[chooseI][chooseJ], matrix[i][j] = matrix[i][j], matrix[chooseI][chooseJ]
-		}
+	row, col := len(matrix), len(matrix[0])
+	for index := row*col - 1; index > 0; index-- {
+		chooseIndex := standaloneRand.Intn(index + 1)
+		matrix[index/col][index%col], matrix[chooseIndex/col][chooseIndex%col] = matrix[chooseIndex/col][chooseIndex%col], matrix[index/col][index%col]
 	}
 }

sattolo.go

@@ -9,11 +9,9 @@ func SattoloShuffle[T any](slice []T) {
 }
 
 func SattoloShuffleMatrix[T any](matrix [][]T) {
-	for i := len(matrix) - 1; i >= 0; i-- {
-		for j := len(matrix[i]) - 1; j >= 0; j-- {
-			chooseI := standaloneRand.Intn(i + 1)
-			chooseJ := standaloneRand.Intn(j + 1)
-			matrix[chooseI][chooseJ], matrix[i][j] = matrix[i][j], matrix[chooseI][chooseJ]
-		}
+	row, col := len(matrix), len(matrix[0])
+	for index := row*col - 1; index > 0; index-- {
+		chooseIndex := standaloneRand.Intn(index)
+		matrix[index/col][index%col], matrix[chooseIndex/col][chooseIndex%col] = matrix[chooseIndex/col][chooseIndex%col], matrix[index/col][index%col]
 	}
 }