Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Common - Optimize arithmeticGetResult function #7232

Merged
merged 2 commits into from
Oct 8, 2019
Merged

Common - Optimize arithmeticGetResult function #7232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02968a3
Optimize arithmeticGetResult
mharis001 Oct 7, 2019
90bbdbd
Add element to default array, safer function
mharis001 Oct 7, 2019
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
65 changes: 29 additions & 36 deletions addons/common/functions/fnc_arithmeticGetResult.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "script_component.hpp"
/*
* Author: PabstMirror
* Gets arithmetic result from a set.
* Returns the arithmetic result of performing the given operation on a set.
*
* Arguments:
* 0: Namespace <OBJECT><LOCATION><MISSIONNAMESPACE>
* 0: Namespace <OBJECT|LOCATION|NAMESPACE>
* 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:
* Value <NUMBER>
Expand All @@ -18,51 +18,44 @@
* Public: Yes
*/

params ["_namespace", "_setID", "_op"];
TRACE_3("arithmeticGetResult",_namespace,_setID,_op);
params ["_namespace", "_setID", "_operation"];
TRACE_3("arithmeticGetResult",_namespace,_setID,_operation);

private _data = (_namespace getVariable _setID) param [2, []];
mharis001 marked this conversation as resolved.
Show resolved Hide resolved

switch (_op) do {
case ("max"): {
private _result = -1e99;
{
_result = _result max (call _x);
nil
} count _data;
_result // return
switch (_operation) do {
case "max": {
selectMax (_data apply {call _x})
};
case "min": {
selectMin (_data apply {call _x})
};
case ("sum"): {
case "sum": {
private _result = 0;

{
_result = _result + (call _x);
nil
} count _data;
_result // return
_result = _result + call _x;
} forEach _data;

_result
};
case ("product"): {
case "product": {
private _result = 1;

{
_result = _result * (call _x);
nil
} count _data;
_result // return
};
case ("min"): {
private _result = 1e99;
{
_result = _result min (call _x);
nil
} count _data;
_result // return
_result = _result * call _x;
} forEach _data;

_result
};
case ("avg"): {
case "avg": {
private _result = 0;

{
_result = _result + (call _x);
nil
} count _data;
_result / (count _data); // return
_result = _result + call _x;
} forEach _data;

_result / count _data
};
default {3735928559};
};
6 changes: 4 additions & 2 deletions addons/common/functions/fnc_arithmeticSetSource.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Adds or removes a source to an arithmetic set.
*
* Arguments:
* 0: Namespace <OBJECT><LOCATION><MISSIONNAMESPACE>
* 0: Namespace <OBJECT|LOCATION|NAMESPACE>
* 1: Number Set ID <STRING>
* 2: Source <STRING>
* 3: Code that returns a number (can access var _namespace) [use {} to remove] <CODE>
Expand All @@ -20,13 +20,15 @@
*/

params ["_namespace", "_setID", "_source", "_variable"];
TRACE_4("params",_namespace,_setID,_source,_variable);
TRACE_4("arithmeticSetSource",_namespace,_setID,_source,_variable);

private _hash = _namespace getVariable _setID;

if (isNil "_hash") then {
_hash = [] call CBA_fnc_hashCreate;
_namespace setVariable [_setID, _hash];
};

if (_variable isEqualTo {}) then {
TRACE_1("removing",_source);
[_hash, _source] call CBA_fnc_hashRem;
Expand Down