Improve MemoryVault.

LoneWandererProductions · LoneWandererProductions · commit be8fe0e8a823 · 2026-02-11T11:15:52.000+01:00
diff --git a/CommonLibraryTests/AlgebraTests.cs b/CommonLibraryTests/AlgebraTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/AlgebraTests.cs
+ * FILE:        AlgebraTests.cs
  * PURPOSE:     Some simple Algebra Tes
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/DataFormatterTests.cs b/CommonLibraryTests/DataFormatterTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/DataFormatterTests.cs
+ * FILE:        DataFormatterTests.cs
  * PURPOSE:     Some basic tests for DataFormatter
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/FractureTests.cs b/CommonLibraryTests/FractureTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/FractureTests.cs
+ * FILE:        FractureTests.cs
  * PURPOSE:     Tests for the Fracture Class
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/HelperMethods.cs b/CommonLibraryTests/HelperMethods.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/HelperMethods.cs
+ * FILE:        HelperMethods.cs
  * PURPOSE:     Helper Methods
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/InterOps.cs b/CommonLibraryTests/InterOps.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/InterOps.cs
+ * FILE:        InterOps.cs
  * PURPOSE:     We try to test basic Interop functions
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/IoFileHandler.cs b/CommonLibraryTests/IoFileHandler.cs
@@ -1,7 +1,7 @@
 ﻿/*
 * COPYRIGHT:   See COPYING in the top level directory
 * PROJECT:     CommonLibraryTests
-* FILE:        CommonLibraryTests/IoFileHandler.cs
+* FILE:        IoFileHandler.cs
 * PURPOSE:     Tests for IoFileHandler
 * PROGRAMER:   Peter Geinitz (Wayfarer)
 */
diff --git a/CommonLibraryTests/IoFileHandlerInternal.cs b/CommonLibraryTests/IoFileHandlerInternal.cs
@@ -1,7 +1,7 @@
 ﻿/*
 * COPYRIGHT:   See COPYING in the top level directory
 * PROJECT:     CommonLibraryTests
-* FILE:        CommonLibraryTests/IoFileHandlerInternal.cs
+* FILE:        IoFileHandlerInternal.cs
 * PURPOSE:     Tests for IoFileHandler, internal stuff
 * PROGRAMER:   Peter Geinitz (Wayfarer)
 */
diff --git a/CommonLibraryTests/IoFileSearch.cs b/CommonLibraryTests/IoFileSearch.cs
@@ -1,7 +1,7 @@
 ﻿/*
 * COPYRIGHT:   See COPYING in the top level directory
 * PROJECT:     CommonLibraryTests
-* FILE:        CommonLibraryTests/IoFileSearch.cs
+* FILE:        IoFileSearch.cs
 * PURPOSE:     Tests for IoFileHandler and mostly the search part
 * PROGRAMER:   Peter Geinitz (Wayfarer)
 */
diff --git a/CommonLibraryTests/LightObjectTests.cs b/CommonLibraryTests/LightObjectTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
 * COPYRIGHT:   See COPYING in the top level directory
 * PROJECT:     CommonLibraryTests
-* FILE:        CommonLibraryTests/LightObjectTests.cs
+* FILE:        LightObjectTests.cs
 * PURPOSE:     Tests for my Light Vector Library
 * PROGRAMER:   Peter Geinitz (Wayfarer)
 */
diff --git a/CommonLibraryTests/LightVectorSaveTests.cs b/CommonLibraryTests/LightVectorSaveTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
 * COPYRIGHT:   See COPYING in the top level directory
 * PROJECT:     CommonLibraryTests
-* FILE:        CommonLibraryTests/LightVectorSaveTests.cs
+* FILE:        LightVectorSaveTests.cs
 * PURPOSE:     Tests for IoFileHandler and mostly the save part
 * PROGRAMER:   Peter Geinitz (Wayfarer)
 */
diff --git a/CommonLibraryTests/MatrixTests.cs b/CommonLibraryTests/MatrixTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/MatrixTests.cs
+ * FILE:        MatrixTests.cs
  * PURPOSE:     Tests for the Math Tools
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/MemoryVaultTests.cs b/CommonLibraryTests/MemoryVaultTests.cs
@@ -0,0 +1,41 @@
+﻿/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     CommonLibraryTests
+ * FILE:        MemoryVaultTests.cs
+ * PURPOSE:     We try to test my MemoryVault class to ensure that it is properly tracking memory usage and that items are being added and removed correctly.
+ * PROGRAMER:   Peter Geinitz (Wayfarer)
+ */
+
+using System;
+using ExtendedSystemObjects;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace CommonLibraryTests
+{
+    /// <summary>
+    /// Memory Tests for the MemoryVault class. We want to ensure that memory tracking is accurate and that items are properly added and removed from the vault.
+    /// </summary>
+    [TestClass]
+    public  class MemoryVaultTests
+    {
+        /// <summary>
+        /// Vaults the memory tracking stays in synchronize.
+        /// </summary>
+        [TestMethod]
+        public void Vault_MemoryTracking_StaysInSync()
+        {
+            var vault = MemoryVault<byte[]>.Instance;
+            vault.Clear(); // Ensure a clean state
+
+            byte[] largeData = new byte[1024 * 1024]; // 1MB
+            var id = vault.Add(largeData, TimeSpan.FromHours(1), "Test Item");
+
+            long sizeAfterAdd = vault.UsedMemory;
+            Assert.IsTrue(sizeAfterAdd >= 1024 * 1024, "Memory should increase.");
+
+            vault.Remove(id);
+            Assert.AreEqual(0, vault.UsedMemory, "Memory should return to zero after removal.");
+        }
+
+    }
+}
diff --git a/CommonLibraryTests/Projections.cs b/CommonLibraryTests/Projections.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/Projections.cs
+ * FILE:        Projections.cs
  * PURPOSE:     Test single parts of the 3D Engine
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/ResourceObjects.cs b/CommonLibraryTests/ResourceObjects.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/ResourceObjects.cs
+ * FILE:        ResourceObjects.cs
  * PURPOSE:     3D Objects
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/ResourcesGeneral.cs b/CommonLibraryTests/ResourcesGeneral.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/ResourcesGeneral.cs
+ * FILE:        ResourcesGeneral.cs
  * PURPOSE:     String Resources
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/SerializeTests.cs b/CommonLibraryTests/SerializeTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/SerializeTests.cs
+ * FILE:        SerializeTests.cs
  * PURPOSE:     Test for Serializer
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/Statistics.cs b/CommonLibraryTests/Statistics.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/Statistics.cs
+ * FILE:        Statistics.cs
  * PURPOSE:     Tests for the Math Tools
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/VectorTests.cs b/CommonLibraryTests/VectorTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/VectorTests.cs
+ * FILE:        VectorTests.cs
  * PURPOSE:     2D and 3d Vector Tests
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/XMLItem.cs b/CommonLibraryTests/XMLItem.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/XMLItem.cs
+ * FILE:        XMLItem.cs
  * PURPOSE:     Test Object
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
diff --git a/CommonLibraryTests/XmlToolsTests.cs b/CommonLibraryTests/XmlToolsTests.cs
@@ -1,7 +1,7 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top-level directory
  * PROJECT:     CommonLibraryTests
- * FILE:        CommonLibraryTests/XmlToolsTests.cs
+ * FILE:        XmlToolsTests.cs
  * PURPOSE:     Test for XML tools
  * PROGRAMMER:  Peter Geinitz (Wayfarer)
  */
diff --git a/ExtendedSystemObjects/FastLinq.cs b/ExtendedSystemObjects/FastLinq.cs
@@ -75,16 +75,25 @@ public static void SelectFast<TSource, TResult>(
         /// <param name="destination">The destination span to receive filtered elements.</param>
         /// <param name="predicate">A function to test each element for inclusion.</param>
         /// <returns>The number of elements written to the destination span.</returns>
-        public static int WhereFast<T>(
-            this ReadOnlySpan<T> span,
-            Span<T> destination,
-            Func<T, bool> predicate)
+        public static int WhereFast<T>(this ReadOnlySpan<T> span, Span<T> destination, Func<T, bool> predicate)
         {
             int count = 0;
+            int destLength = destination.Length; // Cache length to help JIT
+
             foreach (var t in span)
+            {
                 if (predicate(t))
-                    destination[count++] = t;
-
+                {
+                    if ((uint)count < (uint)destLength) // Use uint cast for faster bounds check
+                    {
+                        destination[count++] = t;
+                    }
+                    else
+                    {
+                        throw new ArgumentException("Destination span is too small.");
+                    }
+                }
+            }
             return count;
         }
 
diff --git a/ExtendedSystemObjects/ImmutableLookupMap.cs b/ExtendedSystemObjects/ImmutableLookupMap.cs
@@ -14,7 +14,6 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using ExtendedSystemObjects.Helper;
 
 namespace ExtendedSystemObjects
@@ -70,13 +69,13 @@ public ImmutableLookupMap(IDictionary<TKey, TValue> data)
                 TKey key = kvp.Key;
                 TValue value = kvp.Value;
 
-                // Get initial hash index
-                int hash = GetHash(key) & mask;
+                // Get initial raw hash
+                int hash = GetHash(key);
                 bool placed = false;
 
                 for (int i = 0; i < capacity; i++)
                 {
-                    // Linear probe: check the next slot
+                    // The mask here handles everything (sign bit, wrapping, and range)
                     int index = (int)((uint)(hash + i) & (uint)mask);
 
                     if (!_keyPresence[index])
diff --git a/ExtendedSystemObjects/MemoryVault.cs b/ExtendedSystemObjects/MemoryVault.cs
diff --git a/ExtendedSystemObjects/VaultItem.cs b/ExtendedSystemObjects/VaultItem.cs
diff --git a/ImagingTests/HelperMethods.cs b/ImagingTests/HelperMethods.cs
