Bump to v3.9.2.

This commit is contained in:
jdalton
2015-05-24 01:42:23 -07:00
parent 30daf83737
commit 3d3907ff27
23 changed files with 68 additions and 48 deletions

View File

@@ -1,6 +1,6 @@
import baseRandom from '../internal/baseRandom';
import isIterateeCall from '../internal/isIterateeCall';
import shuffle from './shuffle';
import toArray from '../lang/toArray';
import toIterable from '../internal/toIterable';
/* Native method references for those with the same name as other `lodash` methods. */
@@ -30,8 +30,20 @@ function sample(collection, n, guard) {
var length = collection.length;
return length > 0 ? collection[baseRandom(0, length - 1)] : undefined;
}
var result = shuffle(collection);
result.length = nativeMin(n < 0 ? 0 : (+n || 0), result.length);
var index = -1,
result = toArray(collection),
length = result.length,
lastIndex = length - 1;
n = nativeMin(n < 0 ? 0 : (+n || 0), length);
while (++index < n) {
var rand = baseRandom(index, lastIndex),
value = result[rand];
result[rand] = result[index];
result[index] = value;
}
result.length = n;
return result;
}

View File

@@ -1,5 +1,7 @@
import baseRandom from '../internal/baseRandom';
import toIterable from '../internal/toIterable';
import sample from './sample';
/** Used as references for `-Infinity` and `Infinity`. */
var POSITIVE_INFINITY = Number.POSITIVE_INFINITY;
/**
* Creates an array of shuffled values, using a version of the
@@ -16,20 +18,7 @@ import toIterable from '../internal/toIterable';
* // => [4, 1, 3, 2]
*/
function shuffle(collection) {
collection = toIterable(collection);
var index = -1,
length = collection.length,
result = Array(length);
while (++index < length) {
var rand = baseRandom(0, index);
if (index != rand) {
result[index] = result[rand];
}
result[rand] = collection[index];
}
return result;
return sample(collection, POSITIVE_INFINITY);
}
export default shuffle;