git/lancet
1
0
Fork 0
mirror of https://github.com/duke-git/lancet.git synced 2026-03-01 00:35:28 +08:00
Code Issues Projects Releases Wiki Activity

refactor(mathutil): round related method support generics (#195)

Browse Source
This commit is contained in:
Cannian
2024-03-01 16:04:23 +08:00
committed by GitHub
parent 81d13c2f1a
commit c02c4f813b
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/api/packages/mathutil.md
View File

@@ -392,7 +392,7 @@ func main() {
<b>函数签名:</b> <b>函数签名:</b>
```go ```go
func RoundToFloat(x float64, n int) float64 func RoundToFloat[T constraints.Float | constraints.Integer](x T, n int) float64
``` ```
<b>示例:<span style="float:right;display:inline-block;">[运行](https://go.dev/play/p/ghyb528JRJL)</span></b> <b>示例:<span style="float:right;display:inline-block;">[运行](https://go.dev/play/p/ghyb528JRJL)</span></b>
@@ -428,7 +428,7 @@ func main() {
<b>函数签名:</b> <b>函数签名:</b>
```go ```go
func RoundToString(x float64, n int) string func RoundToString[T constraints.Float | constraints.Integer](x T, n int) string
``` ```
<b>示例:<span style="float:right;display:inline-block;">[运行](https://go.dev/play/p/kZwpBRAcllO)</span></b> <b>示例:<span style="float:right;display:inline-block;">[运行](https://go.dev/play/p/kZwpBRAcllO)</span></b>
@@ -464,7 +464,7 @@ func main() {
<b>函数签名:</b> <b>函数签名:</b>
```go ```go
func TruncRound(x float64, n int) float64 func TruncRound[T constraints.Float | constraints.Integer](x T, n int) T
``` ```
<b>示例:<span style="float:right;display:inline-block;">[运行](https://go.dev/play/p/aumarSHIGzP)</span></b> <b>示例:<span style="float:right;display:inline-block;">[运行](https://go.dev/play/p/aumarSHIGzP)</span></b>

6
docs/en/api/packages/mathutil.md
View File

@@ -392,7 +392,7 @@ func main() {
<b>Signature:</b> <b>Signature:</b>
```go ```go
func RoundToFloat(x float64, n int) float64 func RoundToFloat[T constraints.Float | constraints.Integer](x T, n int) float64
``` ```
<b>Example:<span style="float:right;display:inline-block;">[Run](https://go.dev/play/p/ghyb528JRJL)</span></b> <b>Example:<span style="float:right;display:inline-block;">[Run](https://go.dev/play/p/ghyb528JRJL)</span></b>
@@ -428,7 +428,7 @@ func main() {
<b>Signature:</b> <b>Signature:</b>
```go ```go
func RoundToString(x float64, n int) string func RoundToString[T constraints.Float | constraints.Integer](x T, n int) string
``` ```
<b>Example:<span style="float:right;display:inline-block;">[Run](https://go.dev/play/p/kZwpBRAcllO)</span></b> <b>Example:<span style="float:right;display:inline-block;">[Run](https://go.dev/play/p/kZwpBRAcllO)</span></b>
@@ -464,7 +464,7 @@ func main() {
<b>Signature:</b> <b>Signature:</b>
```go ```go
func TruncRound(x float64, n int) float64 func TruncRound[T constraints.Float | constraints.Integer](x T, n int) T
``` ```
<b>Example:<span style="float:right;display:inline-block;">[Run](https://go.dev/play/p/aumarSHIGzP)</span></b> <b>Example:<span style="float:right;display:inline-block;">[Run](https://go.dev/play/p/aumarSHIGzP)</span></b>

20
mathutil/mathutil.go
View File

@@ -68,26 +68,26 @@ func Percent(val, total float64, n int) float64 {
// RoundToString round up to n decimal places. // RoundToString round up to n decimal places.
// Play: https://go.dev/play/p/kZwpBRAcllO // Play: https://go.dev/play/p/kZwpBRAcllO
func RoundToString(x float64, n int) string { func RoundToString[T constraints.Float | constraints.Integer](x T, n int) string {
tmp := math.Pow(10.0, float64(n)) tmp := math.Pow(10.0, float64(n))
x *= tmp x *= T(tmp)
x = math.Round(x) r := math.Round(float64(x))
result := strconv.FormatFloat(x/tmp, 'f', n, 64) result := strconv.FormatFloat(r/tmp, 'f', n, 64)
return result return result
} }
// RoundToFloat round up to n decimal places. // RoundToFloat round up to n decimal places.
// Play: https://go.dev/play/p/ghyb528JRJL // Play: https://go.dev/play/p/ghyb528JRJL
func RoundToFloat(x float64, n int) float64 { func RoundToFloat[T constraints.Float | constraints.Integer](x T, n int) float64 {
tmp := math.Pow(10.0, float64(n)) tmp := math.Pow(10.0, float64(n))
x *= tmp x *= T(tmp)
x = math.Round(x) r := math.Round(float64(x))
return x / tmp return r / tmp
} }
// TruncRound round off n decimal places. // TruncRound round off n decimal places.
// Play: https://go.dev/play/p/aumarSHIGzP // Play: https://go.dev/play/p/aumarSHIGzP
func TruncRound(x float64, n int) float64 { func TruncRound[T constraints.Float | constraints.Integer](x T, n int) T {
floatStr := fmt.Sprintf("%."+strconv.Itoa(n+1)+"f", x) floatStr := fmt.Sprintf("%."+strconv.Itoa(n+1)+"f", x)
temp := strings.Split(floatStr, ".") temp := strings.Split(floatStr, ".")
var newFloat string var newFloat string
@@ -97,7 +97,7 @@ func TruncRound(x float64, n int) float64 {
newFloat = temp[0] + "." + temp[1][:n] newFloat = temp[0] + "." + temp[1][:n]
} }
result, _ := strconv.ParseFloat(newFloat, 64) result, _ := strconv.ParseFloat(newFloat, 64)
return result return T(result)
} }
// Max return max value of numbers. // Max return max value of numbers.

10
mathutil/mathutil_test.go
View File

@@ -72,6 +72,8 @@ func TestRoundToString(t *testing.T) {
assert.Equal("0.12", RoundToString(0.124, 2)) assert.Equal("0.12", RoundToString(0.124, 2))
assert.Equal("0.13", RoundToString(0.125, 2)) assert.Equal("0.13", RoundToString(0.125, 2))
assert.Equal("0.125", RoundToString(0.125, 3)) assert.Equal("0.125", RoundToString(0.125, 3))
//assert.Equal("54.321", RoundToString(54.321, 3))
//assert.Equal("17.000", RoundToString(17, 3))
} }
func TestTruncRound(t *testing.T) { func TestTruncRound(t *testing.T) {
@@ -79,8 +81,12 @@ func TestTruncRound(t *testing.T) {
assert := internal.NewAssert(t, "TestTruncRound") assert := internal.NewAssert(t, "TestTruncRound")
assert.Equal(float64(0), TruncRound(0, 0)) assert.Equal(float64(0), TruncRound(float64(0), 0))
assert.Equal(float64(0), TruncRound(0, 1)) assert.Equal(float64(0), TruncRound(float64(0), 1))
assert.Equal(float32(0), TruncRound(float32(0), 0))
assert.Equal(float32(0), TruncRound(float32(0), 1))
assert.Equal(0, TruncRound(0, 0))
assert.Equal(uint64(0), TruncRound(uint64(0), 1))
assert.Equal(0.12, TruncRound(0.124, 2)) assert.Equal(0.12, TruncRound(0.124, 2))
assert.Equal(0.12, TruncRound(0.125, 2)) assert.Equal(0.12, TruncRound(0.125, 2))
assert.Equal(0.125, TruncRound(0.125, 3)) assert.Equal(0.125, TruncRound(0.125, 3))