Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-09 02:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename _.random params start and end to lower and upper.

Browse Source
This commit is contained in:
John-David Dalton
2016-01-08 20:13:28 -08:00
parent 946560c998
commit 5a13fe28c9
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lodash.js
View File

@@ -3202,12 +3202,12 @@
* floating-point numbers. * floating-point numbers.
* *
* @private * @private
* @param {number} min The minimum possible value. * @param {number} lower The lower bound.
* @param {number} max The maximum possible value. * @param {number} upper The upper bound.
* @returns {number} Returns the random number. * @returns {number} Returns the random number.
*/ */
function baseRandom(min, max) { function baseRandom(lower, upper) {
return min + nativeFloor(nativeRandom() * (max - min + 1)); return lower + nativeFloor(nativeRandom() * (upper - lower + 1));
} }
/** /**
@@ -11654,10 +11654,10 @@
} }
/** /**
* Produces a random number between `min` and `max` (inclusive). If only one * Produces a random number between the inclusive `lower` and `upper` bounds.
* argument is provided a number between `0` and the given number is returned. * If only one argument is provided a number between `0` and the given number
* If `floating` is `true`, or either `min` or `max` are floats, a * is returned. If `floating` is `true`, or either `lower` or `upper` are floats,
* floating-point number is returned instead of an integer. * a floating-point number is returned instead of an integer.
* *
* **Note:** JavaScript follows the IEEE-754 standard for resolving * **Note:** JavaScript follows the IEEE-754 standard for resolving
* floating-point values which can produce unexpected results. * floating-point values which can produce unexpected results.
@@ -11665,8 +11665,8 @@
* @static * @static
* @memberOf _ * @memberOf _
* @category Number * @category Number
* @param {number} [min=0] The minimum possible value. * @param {number} [lower=0] The lower bound.
* @param {number} [max=1] The maximum possible value. * @param {number} [upper=1] The upper bound.
* @param {boolean} [floating] Specify returning a floating-point number. * @param {boolean} [floating] Specify returning a floating-point number.
* @returns {number} Returns the random number. * @returns {number} Returns the random number.
* @example * @example
@@ -11683,43 +11683,43 @@
* _.random(1.2, 5.2); * _.random(1.2, 5.2);
* // => a floating-point number between 1.2 and 5.2 * // => a floating-point number between 1.2 and 5.2
*/ */
function random(min, max, floating) { function random(lower, upper, floating) {
if (floating && typeof floating != 'boolean' && isIterateeCall(min, max, floating)) { if (floating && typeof floating != 'boolean' && isIterateeCall(lower, upper, floating)) {
max = floating = undefined; upper = floating = undefined;
} }
if (floating === undefined) { if (floating === undefined) {
if (typeof max == 'boolean') { if (typeof upper == 'boolean') {
floating = max; floating = upper;
max = undefined; upper = undefined;
} }
else if (typeof min == 'boolean') { else if (typeof lower == 'boolean') {
floating = min; floating = lower;
min = undefined; lower = undefined;
} }
} }
if (min === undefined && max === undefined) { if (lower === undefined && upper === undefined) {
min = 0; lower = 0;
max = 1; upper = 1;
} }
else { else {
min = toNumber(min) || 0; lower = toNumber(lower) || 0;
if (max === undefined) { if (upper === undefined) {
max = min; upper = lower;
min = 0; lower = 0;
} else { } else {
max = toNumber(max) || 0; upper = toNumber(upper) || 0;
} }
} }
if (min > max) { if (lower > upper) {
var temp = min; var temp = lower;
min = max; lower = upper;
max = temp; upper = temp;
} }
if (floating || min % 1 || max % 1) { if (floating || lower % 1 || upper % 1) {
var rand = nativeRandom(); var rand = nativeRandom();
return nativeMin(min + (rand * (max - min + freeParseFloat('1e-' + ((rand + '').length - 1)))), max); return nativeMin(lower + (rand * (upper - lower + freeParseFloat('1e-' + ((rand + '').length - 1)))), upper);
} }
return baseRandom(min, max); return baseRandom(lower, upper);
} }
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/