HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity

Move random functions together

Browse Source
This commit is contained in:
Todd Parsons 2023-08-31 11:50:29 +01:00
parent 7f7b791837
commit 945ef6b7f5
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/util/Util.js
View File

@ -331,12 +331,62 @@ export function random(size = 1) {
// if size is >1, return an array
let values = []
for (let i = 0; i < size; i++) {
values.push(Math.random());
values.push(random(1));
}
return values
}
}
/**
* Generates random integers a-la NumPy's in the "half-open" interval [min, max). In other words, from min inclusive to max exclusive. When max is undefined, as is the case by default, results are chosen from [0, min). An error is thrown if max is less than min.
*
* @param {number} [min = 0] - lowest integer to be drawn, or highest plus one if max is undefined (default)
* @param {number} max - one above the largest integer to be drawn
* @returns {number} a random integer in the requested range (signed)
*/
export function randint(min, max = null, size = 1)
{
if (!Number.isInteger(size) | size < 1) {
// raise error if given an invalid size
throw {
origin: "util.random",
context: "when generating a random float",
error: "size must be a positive integer above 0",
};
}
if (size > 1) {
// if size > 1, call function multiple times with size = 1 and return an array
let values = []
for (let i = 0; i < size; i++) {
values.push(randint(min, max, 1));
}
return values
}
let lo = min;
let hi = max;
// if no max given, go from 0 to min
if (max === null)
{
hi = lo;
lo = 0;
}
if (hi < lo)
{
throw {
origin: "util.randint",
context: "when generating a random integer",
error: "min should be <= max",
};
}
return Math.floor(Math.random() * (hi - lo)) + lo;
}
/**
* Shuffle an array in place using the Fisher-Yastes's modern algorithm
* <p>See details here: https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_modern_algorithm</p>
@ -953,55 +1003,6 @@ export function turnSquareBracketsIntoArrays(input, max = 1)
return matches;
}
/**
* Generates random integers a-la NumPy's in the "half-open" interval [min, max). In other words, from min inclusive to max exclusive. When max is undefined, as is the case by default, results are chosen from [0, min). An error is thrown if max is less than min.
*
* @param {number} [min = 0] - lowest integer to be drawn, or highest plus one if max is undefined (default)
* @param {number} max - one above the largest integer to be drawn
* @returns {number} a random integer in the requested range (signed)
*/
export function randint(min, max = null, size = 1)
{
if (!Number.isInteger(size) | size < 1) {
// raise error if given an invalid size
throw {
origin: "util.random",
context: "when generating a random float",
error: "size must be a positive integer above 0",
};
}
if (size > 1) {
// if size > 1, call function multiple times with size = 1 and return an array
let values = []
for (let i = 0; i < size; i++) {
values.push(randint(min, max, 1));
}
return values
}
let lo = min;
let hi = max;
// if no max given, go from 0 to min
if (max === null)
{
hi = lo;
lo = 0;
}
if (hi < lo)
{
throw {
origin: "util.randint",
context: "when generating a random integer",
error: "min should be <= max",
};
}
return Math.floor(Math.random() * (hi - lo)) + lo;
}
/**
* Round to a certain number of decimal places.
*