Changeset 25276

Timestamp:

Apr 16, 2021, 9:02:58 AM (3 years ago)

Author:

Freagarach

Message:

Use a map for the weighted list.

Less object creations at addition time, more intuitive handling.

Differential revision: ​https://code.wildfiregames.com/D3854
Comments by: @Stan, @wraitii

Location:

ps/trunk/binaries/data/mods/public/simulation

Files:

• components/BuildingAI.js (modified) (2 diffs)
• helpers/WeightedList.js (modified) (1 diff)

ps/trunk/binaries/data/mods/public/simulation/components/BuildingAI.js

@@ -342 +342 @@
     while (firedArrows < arrowsToFire && targets.length())
     {
-        let selectedIndex = targets.randomIndex();
-        let selectedTarget = targets.itemAt(selectedIndex);
+        let selectedTarget = targets.randomItem();
 
         let targetCmpPosition = Engine.QueryInterface(selectedTarget, IID_Position);
@@ -365 +364 @@
 
         // Could not attack target, try a different target.
-        targets.removeAt(selectedIndex);
+        targets.remove);
     }
 

ps/trunk/binaries/data/mods/public/simulation/helpers/WeightedList.js

@@ -1 @@
-var WeightedList = function()
+()
 {
-    this.elements = [ ];
-    this.totalWeight = 0;
+;
+this.totalWeight = 0;
 };
 
 WeightedList.prototype.length = function()
 {
-    return this.elements.length;
+    return this.elements.;
 };
 
-WeightedList.prototype.push = function(item, weight)
+WeightedList.prototype.push = function(item, weight)
 {
-    if (weight === undefined)
-        weight = 1;
+    this.elements.set(item, weight);
     this.totalWeight += weight;
-    this.elements.push({ "item": item, "weight": weight });
 };
 
-WeightedList.prototype.removeAt = function(index)
+WeightedList.prototype.remove)
 {
-    var element = this.elements.splice(index, 1)[0];
-    if (element)
-        this.totalWeight -= element.weight;
+    const weight = this.elements.get(item);
+    if (weight)
+        this.totalWeight -= weight;
+    this.elements.delete(item);
 };
 
-WeightedList.prototype.itemAt = function(index)
+WeightedList.prototype.)
 {
-    var element = this.elements[index];
-    return element ? element.item : null;
-};
-
-WeightedList.prototype.randomIndex = function() {
-    var element;
-    var targetWeight = randFloat(0, this.totalWeight);
-    var cumulativeWeight = 0;
-    for (var index = 0; index < this.elements.length; index++)
+    const targetWeight = randFloat(0, this.totalWeight);
+    let cumulativeWeight = 0;
+    for (let [item, weight] of this.elements)
     {
-        element = this.elements[index];
-        cumulativeWeight += element.weight;
+        cumulativeWeight += weight;
         if (cumulativeWeight >= targetWeight)
-            return index;
+            return i;
     }
-    return -1;
+    return ;
 };