Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/utils/LibSort.sol
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,9 @@ library LibSort {

/// @dev Sorts and uniquifies `keys`. Updates `values` with the grouped sums by key.
function groupSum(int256[] memory keys, uint256[] memory values) internal pure {
_flipSign(keys);
groupSum(_toUints(keys), values);
_flipSign(keys);
}

/// @dev Returns if `a` has any duplicate. Does NOT mutate `a`. `O(n)`.
Expand Down
63 changes: 63 additions & 0 deletions test/LibSort.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,69 @@ contract LibSortTest is SoladyTest {
assertEq(_sum(sums), oriSum);
}

function testGroupSumSigned() public {
int256[] memory keys = new int256[](5);
uint256[] memory values = new uint256[](5);
keys[0] = 7;
keys[1] = -1;
keys[2] = 3;
keys[3] = -10;
keys[4] = 0;
unchecked {
for (uint256 i; i < 5; ++i) {
values[i] = i + 1;
}
}
LibSort.groupSum(keys, values);
int256[] memory expectedKeys = new int256[](5);
expectedKeys[0] = -10;
expectedKeys[1] = -1;
expectedKeys[2] = 0;
expectedKeys[3] = 3;
expectedKeys[4] = 7;
uint256[] memory expectedValues = new uint256[](5);
expectedValues[0] = 4;
expectedValues[1] = 2;
expectedValues[2] = 5;
expectedValues[3] = 3;
expectedValues[4] = 1;
assertEq(keys, expectedKeys);
assertEq(values, expectedValues);
}

function testGroupSumSigned(bytes32) public {
if (_randomChance(2)) {
_misalignFreeMemoryPointer();
_brutalizeMemory();
}
uint256 n = _random() & 0x1f;
int256[] memory keys = new int256[](n);
uint256[] memory values = new uint256[](n);
unchecked {
for (uint256 i; i < n; ++i) {
keys[i] = int256(_randomUniform() & 0xf) - 8; // Straddles zero.
values[i] = _randomUniform() & 0xff;
}
}
uint256 oriSum = _sum(values);
int256[] memory uniqueKeys = LibSort.copy(keys);
LibSort.insertionSort(uniqueKeys);
LibSort.uniquifySorted(uniqueKeys);
uint256[] memory sums = new uint256[](uniqueKeys.length);
unchecked {
for (uint256 i; i < n; ++i) {
(, uint256 j) = LibSort.searchSorted(uniqueKeys, keys[i]);
sums[j] += values[i];
}
}
LibSort.groupSum(keys, values);
_checkMemory(sums);
assertEq(keys, uniqueKeys);
assertEq(values, sums);
assertEq(_sum(sums), oriSum);
assertTrue(LibSort.isSortedAndUniquified(keys));
}

function _sum(uint256[] memory a) internal pure returns (uint256 result) {
unchecked {
for (uint256 i; i < a.length; ++i) {
Expand Down