mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-22 15:37:59 +00:00
d536318ed6
Miller assumes 64-bit integers, but in Go, the int type varies in size depending on the architecture: 32-bit architectures have int equivalent to int32. As a result, the supported range of integer values is greatly reduced on 32-bit architectures compared to what is suggested by the documentation. This patch explicitly uses int64 wherever 64-bit integers are assumed. Test cases affected by the behaviour of the random generator are updated to reflect the new values (the existing seed doesn't produce the same behaviour since the way random values are generated has changed). Signed-off-by: Stephen Kitt <steve@sk2.org>
87 lines
1.5 KiB
Go
87 lines
1.5 KiB
Go
package bifs
|
|
|
|
import (
|
|
"math"
|
|
|
|
"github.com/johnkerl/miller/internal/pkg/lib"
|
|
"github.com/johnkerl/miller/internal/pkg/mlrval"
|
|
)
|
|
|
|
func BIF_urand() *mlrval.Mlrval {
|
|
return mlrval.FromFloat(
|
|
lib.RandFloat64(),
|
|
)
|
|
}
|
|
|
|
func BIF_urand32() *mlrval.Mlrval {
|
|
return mlrval.FromInt(
|
|
int64(
|
|
lib.RandUint32(),
|
|
),
|
|
)
|
|
}
|
|
|
|
// TODO: use a disposition matrix
|
|
func BIF_urandint(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
|
|
if !input1.IsLegit() {
|
|
return input1
|
|
}
|
|
if !input2.IsLegit() {
|
|
return input2
|
|
}
|
|
if !input1.IsInt() {
|
|
return mlrval.ERROR
|
|
}
|
|
if !input2.IsInt() {
|
|
return mlrval.ERROR
|
|
}
|
|
|
|
a := input1.AcquireIntValue()
|
|
b := input2.AcquireIntValue()
|
|
|
|
var lo int64 = 0
|
|
var hi int64 = 0
|
|
if a <= b {
|
|
lo = a
|
|
hi = b + 1
|
|
} else {
|
|
lo = b
|
|
hi = a + 1
|
|
}
|
|
u := int64(math.Floor(float64(lo) + float64((hi-lo))*lib.RandFloat64()))
|
|
return mlrval.FromInt(u)
|
|
}
|
|
|
|
func BIF_urandrange(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
|
|
if !input1.IsLegit() {
|
|
return input1
|
|
}
|
|
if !input2.IsLegit() {
|
|
return input2
|
|
}
|
|
a, aok := input1.GetNumericToFloatValue()
|
|
b, bok := input2.GetNumericToFloatValue()
|
|
if !aok {
|
|
return mlrval.ERROR
|
|
}
|
|
if !bok {
|
|
return mlrval.ERROR
|
|
}
|
|
return mlrval.FromFloat(
|
|
a + (b-a)*lib.RandFloat64(),
|
|
)
|
|
}
|
|
|
|
func BIF_urandelement(input1 *mlrval.Mlrval) *mlrval.Mlrval {
|
|
arrayval := input1.GetArray()
|
|
if arrayval == nil { // not an array
|
|
return mlrval.ERROR
|
|
}
|
|
if len(arrayval) == 0 {
|
|
return mlrval.ERROR
|
|
}
|
|
|
|
// lo is inclusive, hi is exclusive
|
|
index := lib.RandRange(0, int64(len(arrayval)))
|
|
return arrayval[index].Copy()
|
|
}
|