Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Common - Optimize arithmeticGetResult function (#7232)

Browse Source 
* Optimize arithmeticGetResult

* Add element to default array, safer function

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
mharis001
2019-10-07 20:41:46 -04:00
committed by PabstMirror
parent c1f3e8256b
commit 13ffc07f27
2 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
addons/common/functions/fnc_arithmeticGetResult.sqf
View File

@ -1,12 +1,12 @@
#include "script_component.hpp" #include "script_component.hpp"
/* /*
* Author: PabstMirror * Author: PabstMirror
* Gets arithmetic result from a set. * Returns the arithmetic result of performing the given operation on a set.
* *
* Arguments: * Arguments:
* 0: Namespace <OBJECT><LOCATION><MISSIONNAMESPACE> * 0: Namespace <OBJECT|LOCATION|NAMESPACE>
* 1: Number Set ID <STRING> * 1: Number Set ID <STRING>
* 2: Operation (sum, product, min, max, avg) (Case Sensitive) <STRING> * 2: Operation (max, min, sum, product, avg) (Case Sensitive) <STRING>
* *
* Return Value: * Return Value:
* Value <NUMBER> * Value <NUMBER>
@ -18,51 +18,44 @@
* Public: Yes * Public: Yes
*/ */
params ["_namespace", "_setID", "_op"]; params ["_namespace", "_setID", "_operation"];
TRACE_3("arithmeticGetResult",_namespace,_setID,_op); TRACE_3("arithmeticGetResult",_namespace,_setID,_operation);
private _data = (_namespace getVariable _setID) param [2, []]; private _data = (_namespace getVariable _setID) param [2, [{0}]];
switch (_op) do { switch (_operation) do {
case ("max"): { case "max": {
private _result = -1e99; selectMax (_data apply {call _x})
{
_result = _result max (call _x);
nil
} count _data;
_result // return
}; };
case ("sum"): { case "min": {
selectMin (_data apply {call _x})
};
case "sum": {
private _result = 0; private _result = 0;
{ {
_result = _result + (call _x); _result = _result + call _x;
nil } forEach _data;
} count _data;
_result // return _result
}; };
case ("product"): { case "product": {
private _result = 1; private _result = 1;
{ {
_result = _result * (call _x); _result = _result * call _x;
nil } forEach _data;
} count _data;
_result // return _result
}; };
case ("min"): { case "avg": {
private _result = 1e99;
{
_result = _result min (call _x);
nil
} count _data;
_result // return
};
case ("avg"): {
private _result = 0; private _result = 0;
{ {
_result = _result + (call _x); _result = _result + call _x;
nil } forEach _data;
} count _data;
_result / (count _data); // return _result / count _data
}; };
default {3735928559}; default {3735928559};
}; };

6
addons/common/functions/fnc_arithmeticSetSource.sqf
View File

@ -4,7 +4,7 @@
* Adds or removes a source to an arithmetic set. * Adds or removes a source to an arithmetic set.
* *
* Arguments: * Arguments:
* 0: Namespace <OBJECT><LOCATION><MISSIONNAMESPACE> * 0: Namespace <OBJECT|LOCATION|NAMESPACE>
* 1: Number Set ID <STRING> * 1: Number Set ID <STRING>
* 2: Source <STRING> * 2: Source <STRING>
* 3: Code that returns a number (can access var _namespace) [use {} to remove] <CODE> * 3: Code that returns a number (can access var _namespace) [use {} to remove] <CODE>
@ -20,13 +20,15 @@
*/ */
params ["_namespace", "_setID", "_source", "_variable"]; params ["_namespace", "_setID", "_source", "_variable"];
TRACE_4("params",_namespace,_setID,_source,_variable); TRACE_4("arithmeticSetSource",_namespace,_setID,_source,_variable);
private _hash = _namespace getVariable _setID; private _hash = _namespace getVariable _setID;
if (isNil "_hash") then { if (isNil "_hash") then {
_hash = [] call CBA_fnc_hashCreate; _hash = [] call CBA_fnc_hashCreate;
_namespace setVariable [_setID, _hash]; _namespace setVariable [_setID, _hash];
}; };
if (_variable isEqualTo {}) then { if (_variable isEqualTo {}) then {
TRACE_1("removing",_source); TRACE_1("removing",_source);
[_hash, _source] call CBA_fnc_hashRem; [_hash, _source] call CBA_fnc_hashRem;