mirror of
https://github.com/whoisclebs/lodash.git
synced 2026-02-08 10:17:48 +00:00
Move _.max & _.min to Math category & make _.sum work on collections.
This commit is contained in:
214
lodash.src.js
214
lodash.src.js
@@ -6408,104 +6408,6 @@
|
|||||||
return func(collection, iteratee);
|
return func(collection, iteratee);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the maximum value of `collection`. If `collection` is empty or falsey
|
|
||||||
* `-Infinity` is returned. If an iteratee function is provided it is invoked
|
|
||||||
* for each value in `collection` to generate the criterion by which the value
|
|
||||||
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
|
|
||||||
* arguments; (value, index, collection).
|
|
||||||
*
|
|
||||||
* If a property name is provided for `predicate` the created `_.property`
|
|
||||||
* style callback returns the property value of the given element.
|
|
||||||
*
|
|
||||||
* If a value is also provided for `thisArg` the created `_.matchesProperty`
|
|
||||||
* style callback returns `true` for elements that have a matching property
|
|
||||||
* value, else `false`.
|
|
||||||
*
|
|
||||||
* If an object is provided for `predicate` the created `_.matches` style
|
|
||||||
* callback returns `true` for elements that have the properties of the given
|
|
||||||
* object, else `false`.
|
|
||||||
*
|
|
||||||
* @static
|
|
||||||
* @memberOf _
|
|
||||||
* @category Collection
|
|
||||||
* @param {Array|Object|string} collection The collection to iterate over.
|
|
||||||
* @param {Function|Object|string} [iteratee] The function invoked per iteration.
|
|
||||||
* @param {*} [thisArg] The `this` binding of `iteratee`.
|
|
||||||
* @returns {*} Returns the maximum value.
|
|
||||||
* @example
|
|
||||||
*
|
|
||||||
* _.max([4, 2, 8, 6]);
|
|
||||||
* // => 8
|
|
||||||
*
|
|
||||||
* _.max([]);
|
|
||||||
* // => -Infinity
|
|
||||||
*
|
|
||||||
* var users = [
|
|
||||||
* { 'user': 'barney', 'age': 36 },
|
|
||||||
* { 'user': 'fred', 'age': 40 }
|
|
||||||
* ];
|
|
||||||
*
|
|
||||||
* _.max(users, function(chr) {
|
|
||||||
* return chr.age;
|
|
||||||
* });
|
|
||||||
* // => { 'user': 'fred', 'age': 40 };
|
|
||||||
*
|
|
||||||
* // using the `_.property` callback shorthand
|
|
||||||
* _.max(users, 'age');
|
|
||||||
* // => { 'user': 'fred', 'age': 40 };
|
|
||||||
*/
|
|
||||||
var max = createExtremum(arrayMax);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the minimum value of `collection`. If `collection` is empty or falsey
|
|
||||||
* `Infinity` is returned. If an iteratee function is provided it is invoked
|
|
||||||
* for each value in `collection` to generate the criterion by which the value
|
|
||||||
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
|
|
||||||
* arguments; (value, index, collection).
|
|
||||||
*
|
|
||||||
* If a property name is provided for `predicate` the created `_.property`
|
|
||||||
* style callback returns the property value of the given element.
|
|
||||||
*
|
|
||||||
* If a value is also provided for `thisArg` the created `_.matchesProperty`
|
|
||||||
* style callback returns `true` for elements that have a matching property
|
|
||||||
* value, else `false`.
|
|
||||||
*
|
|
||||||
* If an object is provided for `predicate` the created `_.matches` style
|
|
||||||
* callback returns `true` for elements that have the properties of the given
|
|
||||||
* object, else `false`.
|
|
||||||
*
|
|
||||||
* @static
|
|
||||||
* @memberOf _
|
|
||||||
* @category Collection
|
|
||||||
* @param {Array|Object|string} collection The collection to iterate over.
|
|
||||||
* @param {Function|Object|string} [iteratee] The function invoked per iteration.
|
|
||||||
* @param {*} [thisArg] The `this` binding of `iteratee`.
|
|
||||||
* @returns {*} Returns the minimum value.
|
|
||||||
* @example
|
|
||||||
*
|
|
||||||
* _.min([4, 2, 8, 6]);
|
|
||||||
* // => 2
|
|
||||||
*
|
|
||||||
* _.min([]);
|
|
||||||
* // => Infinity
|
|
||||||
*
|
|
||||||
* var users = [
|
|
||||||
* { 'user': 'barney', 'age': 36 },
|
|
||||||
* { 'user': 'fred', 'age': 40 }
|
|
||||||
* ];
|
|
||||||
*
|
|
||||||
* _.min(users, function(chr) {
|
|
||||||
* return chr.age;
|
|
||||||
* });
|
|
||||||
* // => { 'user': 'barney', 'age': 36 };
|
|
||||||
*
|
|
||||||
* // using the `_.property` callback shorthand
|
|
||||||
* _.min(users, 'age');
|
|
||||||
* // => { 'user': 'barney', 'age': 36 };
|
|
||||||
*/
|
|
||||||
var min = createExtremum(arrayMin, true);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an array of elements split into two groups, the first of which
|
* Creates an array of elements split into two groups, the first of which
|
||||||
* contains elements `predicate` returns truthy for, while the second of which
|
* contains elements `predicate` returns truthy for, while the second of which
|
||||||
@@ -11178,24 +11080,128 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calculates the sum of an array of numbers.
|
* Gets the maximum value of `collection`. If `collection` is empty or falsey
|
||||||
|
* `-Infinity` is returned. If an iteratee function is provided it is invoked
|
||||||
|
* for each value in `collection` to generate the criterion by which the value
|
||||||
|
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
|
||||||
|
* arguments; (value, index, collection).
|
||||||
|
*
|
||||||
|
* If a property name is provided for `predicate` the created `_.property`
|
||||||
|
* style callback returns the property value of the given element.
|
||||||
|
*
|
||||||
|
* If a value is also provided for `thisArg` the created `_.matchesProperty`
|
||||||
|
* style callback returns `true` for elements that have a matching property
|
||||||
|
* value, else `false`.
|
||||||
|
*
|
||||||
|
* If an object is provided for `predicate` the created `_.matches` style
|
||||||
|
* callback returns `true` for elements that have the properties of the given
|
||||||
|
* object, else `false`.
|
||||||
*
|
*
|
||||||
* @static
|
* @static
|
||||||
* @memberOf _
|
* @memberOf _
|
||||||
* @category Math
|
* @category Math
|
||||||
* @param {number} array The numbers to add.
|
* @param {Array|Object|string} collection The collection to iterate over.
|
||||||
* @returns {number} Returns the sum.
|
* @param {Function|Object|string} [iteratee] The function invoked per iteration.
|
||||||
|
* @param {*} [thisArg] The `this` binding of `iteratee`.
|
||||||
|
* @returns {*} Returns the maximum value.
|
||||||
|
* @example
|
||||||
|
*
|
||||||
|
* _.max([4, 2, 8, 6]);
|
||||||
|
* // => 8
|
||||||
|
*
|
||||||
|
* _.max([]);
|
||||||
|
* // => -Infinity
|
||||||
|
*
|
||||||
|
* var users = [
|
||||||
|
* { 'user': 'barney', 'age': 36 },
|
||||||
|
* { 'user': 'fred', 'age': 40 }
|
||||||
|
* ];
|
||||||
|
*
|
||||||
|
* _.max(users, function(chr) {
|
||||||
|
* return chr.age;
|
||||||
|
* });
|
||||||
|
* // => { 'user': 'fred', 'age': 40 };
|
||||||
|
*
|
||||||
|
* // using the `_.property` callback shorthand
|
||||||
|
* _.max(users, 'age');
|
||||||
|
* // => { 'user': 'fred', 'age': 40 };
|
||||||
|
*/
|
||||||
|
var max = createExtremum(arrayMax);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the minimum value of `collection`. If `collection` is empty or falsey
|
||||||
|
* `Infinity` is returned. If an iteratee function is provided it is invoked
|
||||||
|
* for each value in `collection` to generate the criterion by which the value
|
||||||
|
* is ranked. The `iteratee` is bound to `thisArg` and invoked with three
|
||||||
|
* arguments; (value, index, collection).
|
||||||
|
*
|
||||||
|
* If a property name is provided for `predicate` the created `_.property`
|
||||||
|
* style callback returns the property value of the given element.
|
||||||
|
*
|
||||||
|
* If a value is also provided for `thisArg` the created `_.matchesProperty`
|
||||||
|
* style callback returns `true` for elements that have a matching property
|
||||||
|
* value, else `false`.
|
||||||
|
*
|
||||||
|
* If an object is provided for `predicate` the created `_.matches` style
|
||||||
|
* callback returns `true` for elements that have the properties of the given
|
||||||
|
* object, else `false`.
|
||||||
|
*
|
||||||
|
* @static
|
||||||
|
* @memberOf _
|
||||||
|
* @category Math
|
||||||
|
* @param {Array|Object|string} collection The collection to iterate over.
|
||||||
|
* @param {Function|Object|string} [iteratee] The function invoked per iteration.
|
||||||
|
* @param {*} [thisArg] The `this` binding of `iteratee`.
|
||||||
|
* @returns {*} Returns the minimum value.
|
||||||
|
* @example
|
||||||
|
*
|
||||||
|
* _.min([4, 2, 8, 6]);
|
||||||
|
* // => 2
|
||||||
|
*
|
||||||
|
* _.min([]);
|
||||||
|
* // => Infinity
|
||||||
|
*
|
||||||
|
* var users = [
|
||||||
|
* { 'user': 'barney', 'age': 36 },
|
||||||
|
* { 'user': 'fred', 'age': 40 }
|
||||||
|
* ];
|
||||||
|
*
|
||||||
|
* _.min(users, function(chr) {
|
||||||
|
* return chr.age;
|
||||||
|
* });
|
||||||
|
* // => { 'user': 'barney', 'age': 36 };
|
||||||
|
*
|
||||||
|
* // using the `_.property` callback shorthand
|
||||||
|
* _.min(users, 'age');
|
||||||
|
* // => { 'user': 'barney', 'age': 36 };
|
||||||
|
*/
|
||||||
|
var min = createExtremum(arrayMin, true);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the sum of `collection` values.
|
||||||
|
*
|
||||||
|
* @static
|
||||||
|
* @memberOf _
|
||||||
|
* @category Math
|
||||||
|
* @param {Array|Object|string} collection The collection to iterate over.
|
||||||
|
* @returns {number} Returns the sum of values.
|
||||||
* @example
|
* @example
|
||||||
*
|
*
|
||||||
* _.sum([4, 6, 2]);
|
* _.sum([4, 6, 2]);
|
||||||
* // => 12
|
* // => 12
|
||||||
|
*
|
||||||
|
* _.sum({ 'a': 4, 'b': 6, 'c': 2 });
|
||||||
|
* // => 12
|
||||||
*/
|
*/
|
||||||
function sum(array) {
|
function sum(collection) {
|
||||||
var length = array ? array.length : 0,
|
if (!isArray(collection)) {
|
||||||
|
collection = toIterable(collection);
|
||||||
|
}
|
||||||
|
var length = collection.length,
|
||||||
result = 0;
|
result = 0;
|
||||||
|
|
||||||
while (length--) {
|
while (length--) {
|
||||||
result += array[length];
|
result += +collection[length] || 0;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
20
test/test.js
20
test/test.js
@@ -9648,7 +9648,7 @@
|
|||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
test('should return the largest value from a collection', 1, function() {
|
test('should return the largest value from a collection', 1, function() {
|
||||||
strictEqual(3, _.max([1, 2, 3]));
|
strictEqual(_.max([1, 2, 3]), 3);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should return `-Infinity` for empty collections', 1, function() {
|
test('should return `-Infinity` for empty collections', 1, function() {
|
||||||
@@ -10067,7 +10067,7 @@
|
|||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
test('should return the smallest value from a collection', 1, function() {
|
test('should return the smallest value from a collection', 1, function() {
|
||||||
strictEqual(1, _.min([1, 2, 3]));
|
strictEqual(_.min([1, 2, 3]), 1);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should return `Infinity` for empty collections', 1, function() {
|
test('should return `Infinity` for empty collections', 1, function() {
|
||||||
@@ -13340,7 +13340,7 @@
|
|||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
test('should return the sum of an array of numbers', 1, function() {
|
test('should return the sum of an array of numbers', 1, function() {
|
||||||
equal(_.sum([6, 4, 2]), 12);
|
strictEqual(_.sum([6, 4, 2]), 12);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('should return `0` when passing empty `array` values', 1, function() {
|
test('should return `0` when passing empty `array` values', 1, function() {
|
||||||
@@ -13352,6 +13352,20 @@
|
|||||||
|
|
||||||
deepEqual(actual, expected);
|
deepEqual(actual, expected);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('should coerce values to numbers and `NaN` to `0`', 1, function() {
|
||||||
|
strictEqual(_.sum(['1', NaN, '2']), 3);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should iterate an object', 1, function() {
|
||||||
|
strictEqual(_.sum({ 'a': 1, 'b': 2, 'c': 3 }), 6);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should iterate a string', 2, function() {
|
||||||
|
_.each(['123', Object('123')], function(value) {
|
||||||
|
strictEqual(_.sum(value), 6);
|
||||||
|
});
|
||||||
|
});
|
||||||
}());
|
}());
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------*/
|
/*--------------------------------------------------------------------------*/
|
||||||
|
|||||||
Reference in New Issue
Block a user