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

feat: allow making a weighted container ordered #320

Draft
wants to merge 2 commits into
base: development
Choose a base branch
from
Draft

feat: allow making a weighted container ordered #320

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94288fc
feat: allow making a weighted container ordered
LordMidas Oct 7, 2023
78338c2
fix: add and remove functions when array is not null
LordMidas Oct 7, 2023
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
50 changes: 49 additions & 1 deletion msu/classes/weighted_container.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
Total = null;
Table = null;
Array = null;
Forced = null;
NextIItems = null;
NextIIndex = null;
Expand All @@ -16,7 +17,8 @@

function _get( _item )
{
if (_item in this.Table) return this.Table[_item];
if (this.Array != null) return this.Array[_item]; // _item is an idx in this case
else if (_item in this.Table) return this.Table[_item];
throw null;
}

Expand All @@ -25,10 +27,24 @@
this.Total = _original.Total;
this.Table = clone _original.Table;
this.Forced = clone _original.Forced;
this.Array = _original.Array == null ? null : clone _original.Array;
}

function _nexti( _prev )
{
if (this.Array != null)
{
if (this.Array.len() == 0)
return null;

if (_prev == null)
return 0;
else if (_prev == this.Array.len() - 1)
return null;

return _prev + 1;
}

if (_prev == null)
{
this.NextIItems = ::MSU.Table.keys(this.Table);
Expand Down Expand Up @@ -93,11 +109,17 @@
{
this.Table[_item] <- 0;
this.updateWeight(_item, _weight);
if (this.Array != null) this.Array.push(_item);
}
}

function remove( _item )
{
if (this.Array != null) // _item is an idx
{
_item = this.Array.remove(this.Array.find(_item));
}

if (this.Table[_item] < 0) delete this.Forced[_item];
else this.Total -= this.Table[_item];
delete this.Table[_item];
Expand All @@ -108,6 +130,29 @@
return _item in this.Table;
}

function makeOrdered( _bool = true )
{
if (_bool)
{
this.Array = ::MSU.Table.keys(this.Table);
this.sort();
}
else
{
this.Array = null;
}
}

function isOrdered()
{
return this.Array != null;
}

function sort()
{
this.Array.sort(@(a, b) this.Table[a] <=> this.Table[b]); // Sort ascending
}

function getProbability( _item, _exclude = null )
{
if (_exclude != null)
Expand Down Expand Up @@ -155,6 +200,7 @@
// must return a len 2 array with weight, item as elements

local ret = ::MSU.Class.WeightedContainer();
if (this.Array != null) ret.makeOrdered();
foreach (item, weight in this.Table)
{
local pair = _function(item, weight);
Expand All @@ -169,6 +215,7 @@
// must return a boolean

local ret = ::MSU.Class.WeightedContainer();
if (this.Array != null) ret.makeOrdered();
foreach (item, weight in this.Table)
{
if (_function(item, weight)) ret.add(item, weight);
Expand All @@ -181,6 +228,7 @@
this.Total = 0.0;
this.Table.clear();
this.Forced.clear();
if (this.Array != null) this.Array.clear();
}

function max()
Expand Down