Namespace fixes

Wsm2110 · Apr 14, 2024 · 9a535f7 · 9a535f7
1 parent 2bfc5ec
commit 9a535f7
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 22 deletions.
diff --git a/benchmarks/Faster.Map.Concurrent.Benchmark/AddBenchmark.cs b/benchmarks/Faster.Map.Concurrent.Benchmark/AddBenchmark.cs
@@ -4,7 +4,7 @@
 using BenchmarkDotNet.Attributes;
 using Faster.Map.Concurrent;
 
-namespace Faster.Map.Benchmark
+namespace Faster.Map.Concurrent.Benchmark
 {
     [MarkdownExporterAttribute.GitHub]
     public class AddBenchmark

diff --git a/benchmarks/Faster.Map.Concurrent.Benchmark/Program.cs b/benchmarks/Faster.Map.Concurrent.Benchmark/Program.cs
@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Running;
-using Faster.Map.Benchmark;
 
 namespace Faster.Map.Concurrent.Benchmark
 {

diff --git a/src/Faster.Map.RobinhoodMap/RobinHoodMap.cs b/src/Faster.Map.RobinhoodMap/RobinHoodMap.cs
@@ -160,8 +160,8 @@ public RobinhoodMap(uint length, double loadFactor, IEqualityComparer<TKey> keyC
             _shift = (byte)(_shift - BitOperations.Log2(_length));
 
             var size = (int)_length + _maxProbeSequenceLength;
-            _entries = GC.AllocateUninitializedArray<Entry>(size);
-            _meta = GC.AllocateUninitializedArray<byte>(size);
+            _entries = GC.AllocateArray<Entry>(size);
+            _meta = GC.AllocateArray<byte>(size);
         }
 
         #endregion
@@ -237,7 +237,7 @@ public bool Get(TKey key, out TValue value)
             var maxDistance = index + _maxProbeSequenceLength;
             do
             {
-                var entry = Find(_entries, index);
+               ref var entry = ref Find(_entries, index);
 
                 if (_keyComparer.Equals(entry.Key, key))
                 {
@@ -552,7 +552,7 @@ private void Resize()
             var oldEntries = _entries;
             var oldMeta = _meta;
 
-            _entries = GC.AllocateUninitializedArray<Entry>(size);
+            _entries = GC.AllocateArray<Entry>(size);
             _meta = GC.AllocateArray<byte>(size);
 
             for (uint i = 0; i < oldMeta.Length; ++i)

diff --git a/unittests/Faster.Map.DenseMap.Tests/DenseMapStringWrapperTests.cs b/unittests/Faster.Map.DenseMap.Tests/DenseMapStringWrapperTests.cs
@@ -2,7 +2,7 @@
 using Faster.Map.DenseMap;
 using Xunit;
 
-namespace Faster.Map.Densemap.Tests
+namespace Faster.Map.DenseMap.Tests
 {
     public class DenseMapStringWrapperTests
     {

diff --git a/unittests/Faster.Map.QuadMap.Tests/QuadMapContainsTests.cs b/unittests/Faster.Map.QuadMap.Tests/QuadMapContainsTests.cs
@@ -1,7 +1,6 @@
-using Faster.Map;
-using Faster.Map.QuadMap;
+using Faster.Map.QuadMap;
 
-namespace Faster.Map.RobinhoodMap.Tests
+namespace Faster.Map.QuadMap.Tests
 {
     public class RobinhoodContainsTests
     {

diff --git a/unittests/Faster.Map.QuadMap.Tests/QuadMapGetOrUpdateByRefTests.cs b/unittests/Faster.Map.QuadMap.Tests/QuadMapGetOrUpdateByRefTests.cs
@@ -1,6 +1,6 @@
 using Faster.Map.QuadMap;
 
-namespace Faster.Map.RobinhoodMap.Tests
+namespace Faster.Map.QuadMap.Tests
 {
     public class QuadMapGetOrUpdateByRefTests
     {
@@ -41,7 +41,7 @@ public void EmplaceOrUpdate_ByRefValue()
         {
             // Arrange
             var dictionary = new QuadMap<uint, uint>(); // Initialize your dictionary
-           
+
             var existingKey = 2u/* Create an existing key */;
             var existingValue = 4u /* Create an existing value corresponding to the existing key */;
 

diff --git a/unittests/Faster.Map.QuadMap.Tests/QuadMapRemoveUnitTests.cs b/unittests/Faster.Map.QuadMap.Tests/QuadMapRemoveUnitTests.cs
@@ -1,7 +1,6 @@
 using Faster.Map.QuadMap;
-using Faster.Map.QuadMap.Tests;
 
-namespace Faster.Map.RobinhoodMap.Tests
+namespace Faster.Map.QuadMap.Tests
 {
     public class QuadMapRemoveUnitTests(QuadMapFixture fixture) : IClassFixture<QuadMapFixture>
     {
@@ -18,7 +17,7 @@ public void Clear_RemovesAllElements()
             map.Clear();
 
             // Assert
-            Assert.Equal(0u, map.Count);         
+            Assert.Equal(0u, map.Count);
         }
 
         [Fact]

diff --git a/unittests/Faster.Map.QuadMap.Tests/QuadMapStringTests.cs b/unittests/Faster.Map.QuadMap.Tests/QuadMapStringTests.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Faster.Map.RobinhoodMap.Tests
+namespace Faster.Map.QuadMap.Tests
 {
     public class QuadMapStringTests
     {

diff --git a/unittests/Faster.Map.QuadMap.Tests/QuadMapStringWrapperTests.cs b/unittests/Faster.Map.QuadMap.Tests/QuadMapStringWrapperTests.cs
@@ -1,7 +1,7 @@
 using Faster.Map.Core;
 using Faster.Map.QuadMap;
 
-namespace Faster.Map.RobinhoodMap.Tests
+namespace Faster.Map.QuadMap.Tests
 {
     public class QuadMapStringWrapperTests
     {
@@ -12,7 +12,7 @@ public void Emplace_StringWrapper_Should_Return_Correct_String()
             // Assign
             var map = new QuadMap<StringWrapper, StringWrapper>();
 
-            map.Emplace("one", "Nine");          
+            map.Emplace("one", "Nine");
 
             // Act
             map.Get("one", out var result); ;

diff --git a/unittests/Faster.Map.RobinhoodMap.Tests/RobinhoodBenchmarkFixture.cs b/unittests/Faster.Map.RobinhoodMap.Tests/RobinhoodBenchmarkFixture.cs
@@ -1,5 +1,4 @@
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
-
+
 namespace Faster.Map.RobinhoodMap.Tests
 {
     public class RobinhoodBenchmarkFixture

diff --git a/unittests/Faster.Map.RobinhoodMap.Tests/RobinhoodStringTests.cs b/unittests/Faster.Map.RobinhoodMap.Tests/RobinhoodStringTests.cs
@@ -28,14 +28,36 @@ public void Get_Strings_Return_Succesful(uint amount)
             for (uint i = 0; i < amount; i++)
             {
                 // Act
-                var result = map.Get(i.ToString(), out var _);
+                var result = map.Get(i.ToString(), out var x);
                 if (!result)
                 {
                     // Assert
-                    Assert.Fail();
+                    Assert.True(result, $"{x} failed");
                 }
             }
         }
 
+        [Fact]
+        public void Get_Strings_Return_Succesful_PartTwo()
+        {
+            for (uint i = 0; i < 1000; i++)
+            {
+                // Arrange
+                var map = new RobinhoodMap<string, string>();
+
+                for (uint ii = 0; ii < 1000; ii++)
+                {
+                    map.Emplace(ii.ToString(), Guid.NewGuid().ToString());
+                }
+
+                for (uint ii = 0; ii < 1000; ii++)
+                {
+                    // Act
+                    var result = map.Get(ii.ToString(), out var x);
+
+                    Assert.True(result, $"{x} failed");
+                }
+            }
+        }
     }
 }