Fixing MultiSet.remove

Fix #197
Yomguithereal · Oct 4, 2022 · 87a2d24 · 87a2d24
1 parent 7b09731
commit 87a2d24
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.39.3 (provisional)
+
+* Fixing `NaN` size issue with `MultiSet.remove` when removing non-existent keys.
+
 ## 0.39.2
 
 * Fixing typings of low-level structure consuming methods (@jerome-benoit).

diff --git a/multi-set.js b/multi-set.js
@@ -175,15 +175,20 @@ MultiSet.prototype.remove = function(item, count) {
   if (typeof count !== 'number')
     throw new Error('mnemonist/multi-set.remove: given count should be a number.');
 
-  var currentCount = this.multiplicity(item),
-      newCount = Math.max(0, currentCount - count);
+  var currentCount = this.items.get(item);
+
+  if (typeof currentCount === 'undefined') return;
+
+  var newCount = Math.max(0, currentCount - count);
 
   if (newCount === 0) {
-    this.delete(item);
+    this.items.delete(item);
+    this.size -= currentCount;
+    this.dimension--;
   }
   else {
     this.items.set(item, newCount);
-    this.size -= (currentCount - newCount);
+    this.size -= count;
   }
 
   return;

diff --git a/test/multi-set.js b/test/multi-set.js
@@ -311,6 +311,23 @@ describe('MultiSet', function() {
     assert.deepStrictEqual(top, [['i', 7]]);
   });
 
+  it('size should remain consistent (issue #197).', function() {
+    var set = new MultiSet();
+
+    set.add('one');
+    set.add('one');
+    set.remove('one');
+    set.remove('one');
+
+    assert.strictEqual(set.size, 0);
+    assert.strictEqual(set.dimension, 0);
+
+    set.remove('one');
+
+    assert.strictEqual(set.size, 0);
+    assert.strictEqual(set.dimension, 0);
+  });
+
   describe('helpers', function() {
 
     it('#.isSuperset', function() {