Revert "feat: efficiency"

songzhibin97 · songzhibin97 · commit 03c18dc0cc9f · 2023-02-03T20:27:13.000+08:00
This reverts commit ebbb0a8.
diff --git a/fisher_yates_knuth_shuffle.go b/fisher_yates_knuth_shuffle.go
@@ -21,6 +21,6 @@ func FisherYatesShuffleMatrix[T any](matrix [][]T) {
 	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-1)], matrix[chooseIndex>>col][chooseIndex&(col-1)] = matrix[chooseIndex>>col][chooseIndex&(col-1)], matrix[index>>col][index&(col-1)]
+		matrix[index/col][index%col], matrix[chooseIndex/col][chooseIndex%col] = matrix[chooseIndex/col][chooseIndex%col], matrix[index/col][index%col]
 	}
 }
diff --git a/sattolo.go b/sattolo.go
@@ -12,6 +12,6 @@ func SattoloShuffleMatrix[T any](matrix [][]T) {
 	row, col := len(matrix), len(matrix[0])
 	for index := row*col - 1; index > 0; index-- {
 		chooseIndex := standaloneRand.Intn(index)
-		matrix[index>>col][index&(col-1)], matrix[chooseIndex>>col][chooseIndex&(col-1)] = matrix[chooseIndex>>col][chooseIndex&(col-1)], matrix[index>>col][index&(col-1)]
+		matrix[index/col][index%col], matrix[chooseIndex/col][chooseIndex%col] = matrix[chooseIndex/col][chooseIndex%col], matrix[index/col][index%col]
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ func FisherYatesShuffleMatrix[T any](matrix [][]T) {`
`21`	`21`	`row, col := len(matrix), len(matrix[0])`
`22`	`22`	`for index := row*col - 1; index > 0; index-- {`
`23`	`23`	`chooseIndex := standaloneRand.Intn(index + 1)`
`24`		`- matrix[index>>col][index&(col-1)], matrix[chooseIndex>>col][chooseIndex&(col-1)] = matrix[chooseIndex>>col][chooseIndex&(col-1)], matrix[index>>col][index&(col-1)]`
	`24`	`+ matrix[index/col][index%col], matrix[chooseIndex/col][chooseIndex%col] = matrix[chooseIndex/col][chooseIndex%col], matrix[index/col][index%col]`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ func SattoloShuffleMatrix[T any](matrix [][]T) {`
`12`	`12`	`row, col := len(matrix), len(matrix[0])`
`13`	`13`	`for index := row*col - 1; index > 0; index-- {`
`14`	`14`	`chooseIndex := standaloneRand.Intn(index)`
`15`		`- matrix[index>>col][index&(col-1)], matrix[chooseIndex>>col][chooseIndex&(col-1)] = matrix[chooseIndex>>col][chooseIndex&(col-1)], matrix[index>>col][index&(col-1)]`
	`15`	`+ matrix[index/col][index%col], matrix[chooseIndex/col][chooseIndex%col] = matrix[chooseIndex/col][chooseIndex%col], matrix[index/col][index%col]`
`16`	`16`	`}`
`17`	`17`	`}`