Bugfix: Exception when merging with empty TDigest

ASolomatin · Sep 8, 2023 · 1d8da70 · 1d8da70
1 parent 5f2bb51
commit 1d8da70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/TDigestNet.Tests/TestMergeMultiple.cs b/src/TDigestNet.Tests/TestMergeMultiple.cs
@@ -8,6 +8,7 @@ public class TestMergeMultiple : TestBase
     private readonly TDigest _digestB = new();
     private readonly TDigest _digestC = new();
     private readonly TDigest _digestD = new();
+    private readonly TDigest _digestEmpty = new();
     private readonly TDigest _merged;
 
     public TestMergeMultiple()
@@ -42,7 +43,7 @@ public TestMergeMultiple()
 
         _actual.Sort();
 
-        _merged = TDigest.MergeMultiple(_digestA,  _digestB, _digestC, _digestD);
+        _merged = TDigest.MergeMultiple(_digestA,  _digestB, _digestEmpty, _digestC, _digestD);
     }
 
     [Test, Order(0)]

diff --git a/src/TDigestNet/TDigest.cs b/src/TDigestNet/TDigest.cs
@@ -508,9 +508,8 @@ IEnumerable<Centroid> Enumerate()
             var centroids = new Centroid?[enumeratorsCount];
             try
             {
-                for (int i = 0; i < enumeratorsCount;)
-                    if (LoadValue(i))
-                        i++;
+                for (int i = 0; i < enumeratorsCount; i++)
+                    LoadValue(i);
 
                 while (enumeratorsLost != 0)
                 {
@@ -549,7 +548,7 @@ IEnumerable<Centroid> Enumerate()
             }
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            bool LoadValue(int i)
+            void LoadValue(int i)
             {
                 var enumerator = enumerators[i];
 
@@ -564,11 +563,7 @@ bool LoadValue(int i)
                     enumerators[i] = null;
                     centroids[i] = null;
                     enumeratorsLost--;
-
-                    return false;
                 }
-
-                return true;
             }
         }
     }