Update some array functions #635
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
approx 10x faster
added a new feature, removed the old warning
commy2
reviewed
Apr 10, 2017
addons/arrays/fnc_findMin.sqf
Outdated
|
|
||
| [_min, _array find _min] | ||
| private _max = selectMin _array; | ||
| [_max, _array find _max] |
There was a problem hiding this comment.
Variable name should still be _min :)
commy2
reviewed
Apr 10, 2017
addons/arrays/fnc_shuffle.sqf
Outdated
| [] + _this; | ||
| }; | ||
| }; | ||
| _this params [["_array",[],[[]]],["_inPlace",false,[false]]]; |
There was a problem hiding this comment.
The _this is superfluous as it's the variable used by the default unary syntax of params.
There was a problem hiding this comment.
Just personal style, the compiler is adding it anyways
I can remove it, if you like.
There was a problem hiding this comment.
The Arma compiler does not add _this to the unary syntax of params.
There was a problem hiding this comment.
You are right, I don't know why I was thinking this.
commy2
reviewed
Apr 10, 2017
addons/arrays/fnc_select.sqf
Outdated
| } forEach _array; | ||
|
|
||
| _result | ||
| _array select {_x call _filterCode} |
There was a problem hiding this comment.
This makes the function no longer support _forEachIndex!
There was a problem hiding this comment.
Ahhh, I remember. I'll remove.
This reverts commit 68a3a6e.
|
Re |
|
So mark them as deprecated and revert fc75b17 too? |
|
I'd say yes. |
PabstMirror
reviewed
Apr 10, 2017
addons/arrays/fnc_shuffle.sqf
Outdated
| If (_inPlace) then { | ||
| for "_size" from (count _tempArray) to 1 step -1 do { | ||
| _array set [_size-1,(_tempArray deleteAt (floor random _size))]; | ||
| }; |
There was a problem hiding this comment.
Should we still return the array here?
|
^ please change the tests in a separate pull request. This is to make sure that potential errors aren't missed. |
This reverts commit 7fb6a3b.
Dorbedo
added a commit
to Dorbedo/CBA_A3
that referenced
this pull request
Apr 10, 2017
Merged
|
Alright. |
|
|
This pull request drops support for the deprecated syntax of the function: // Support the deprecated parameter style: [1, 2, 3, 4, 5] call CBA_fnc_shuffle.
_tempArray = if (count _this != 1) then {
WARNING("CBA_fnc_shuffle requires an array as first parameter, not just a direct array: " + str _this);
[] + _this;
} else {
if (IS_ARRAY(_this select 0)) then {
[] + (_this select 0); // Correct params passed.
} else {
WARNING("CBA_fnc_shuffle requires an array as first parameter, not just a direct array: " + str _this);
[] + _this;
};
}; |
fix some spacing - OCD
Killswitch00
approved these changes
Apr 13, 2017
commy2
pushed a commit
that referenced
this pull request
Apr 15, 2017
* new shuffle test #635 * Keeping the old test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
select update