Do some cleanup

LoneWandererProductions · LoneWandererProductions · commit 72dc01df2f87 · 2025-06-20T10:41:08.000+02:00
diff --git a/ExtendedSystemObjects/CategorizedDictionary.cs b/ExtendedSystemObjects/CategorizedDictionary.cs
@@ -16,6 +16,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using ExtendedSystemObjects.Helper;
 
 namespace ExtendedSystemObjects
 {
@@ -381,17 +382,17 @@ public static bool AreEqual<TKey, TValue>(CategorizedDictionary<TKey, TValue> ex
         {
             if (expected == null || actual == null)
             {
-                message = ExtendedSystemObjectsResources.NullDictionaries;
+                message = SharedResources.NullDictionaries;
                 return false;
             }
 
             if (expected.Equals(actual))
             {
-                message = ExtendedSystemObjectsResources.DictionariesEqual;
+                message = SharedResources.DictionariesEqual;
                 return true;
             }
 
-            message = ExtendedSystemObjectsResources.DictionaryComparisonFailed;
+            message = SharedResources.DictionaryComparisonFailed;
             return false;
         }
 
@@ -406,7 +407,7 @@ public override string ToString()
             try
             {
                 var entries = _data.Select(entry =>
-                    string.Format(ExtendedSystemObjectsResources.KeyCategoryValueFormat, entry.Key,
+                    string.Format(SharedResources.KeyCategoryValueFormat, entry.Key,
                         entry.Value.Category,
                         entry.Value.Value));
 
@@ -483,7 +484,7 @@ private void AddInternal(string category, TK key, TV value)
         {
             if (_data.ContainsKey(key))
             {
-                throw new ArgumentException($"{ExtendedSystemObjectsResources.ErrorKeyExists}{key}");
+                throw new ArgumentException($"{SharedResources.ErrorKeyExists}{key}");
             }
 
             _data[key] = (category, value);
diff --git a/ExtendedSystemObjects/ExtendedDictionary.cs b/ExtendedSystemObjects/ExtendedDictionary.cs
@@ -130,13 +130,13 @@ public static void AddDistinctKeyValue<TKey, TValue>(this Dictionary<TKey, TValu
         {
             if (dic.ContainsKey(key))
             {
-                throw new ArgumentException(string.Concat(ExtendedSystemObjectsResources.ErrorKeyExists,
+                throw new ArgumentException(string.Concat(SharedResources.ErrorKeyExists,
                     nameof(value)));
             }
 
             if (dic.ContainsValue(value))
             {
-                throw new ArgumentException(string.Concat(ExtendedSystemObjectsResources.ErrorValueExists,
+                throw new ArgumentException(string.Concat(SharedResources.ErrorValueExists,
                     nameof(value)));
             }
 
@@ -235,7 +235,7 @@ public static TKey GetFirstKeyByValue<TKey, TValue>(this IDictionary<TKey, TValu
                 return pair.Key;
             }
 
-            throw new ValueNotFoundException(ExtendedSystemObjectsResources.ErrorValueNotFound);
+            throw new ValueNotFoundException(SharedResources.ErrorValueNotFound);
         }
 
         /// <summary>
@@ -253,7 +253,7 @@ public static List<TKey> GetKeysByValue<TKey, TValue>(this IDictionary<TKey, TVa
 
             if (collection.Count == 0)
             {
-                throw new ValueNotFoundException(ExtendedSystemObjectsResources.ErrorValueNotFound);
+                throw new ValueNotFoundException(SharedResources.ErrorValueNotFound);
             }
 
             return collection;
@@ -277,7 +277,7 @@ public static Dictionary<TKey, TValue> GetDictionaryByValues<TKey, TValue>(this
 
             if (collection.Count == 0)
             {
-                throw new ValueNotFoundException(ExtendedSystemObjectsResources.ErrorNoValueFound);
+                throw new ValueNotFoundException(SharedResources.ErrorNoValueFound);
             }
 
             return collection;
diff --git a/ExtendedSystemObjects/Helper/SharedResources.cs b/ExtendedSystemObjects/Helper/SharedResources.cs
diff --git a/ExtendedSystemObjects/Helper/SharedRessources.cs b/ExtendedSystemObjects/Helper/SharedRessources.cs
@@ -1,17 +1,17 @@
 ﻿/*
  * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ExtendedSystemObjects
- * FILE:        ExtendedSystemObjects/ExtendedSystemObjectsResources.cs
- * PURPOSE:     Generic System Functions for ListsCollection of Strings
+ * PROJECT:     ExtendedSystemObjects.Helper
+ * FILE:        ExtendedSystemObjects.Helper/SharedResources.cs
+ * PURPOSE:     Generic System Functions for ListsCollection of Strings and constants.
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
 
-namespace ExtendedSystemObjects
+namespace ExtendedSystemObjects.Helper
 {
     /// <summary>
     ///     The extended system objects Resources class.
     /// </summary>
-    internal static class ExtendedSystemObjectsResources
+    internal static class SharedResources
     {
         /// <summary>
         ///     Error value not found (const). "Value not found in the dictionary".
@@ -62,5 +62,14 @@ internal static class ExtendedSystemObjectsResources
         ///     The key category value format (const). Value:  "Key: {0}, Category: {1}, Value: {2}".
         /// </summary>
         internal const string KeyCategoryValueFormat = "Key: {0}, Category: {1}, Value: {2}";
+
+        /// <summary>
+        ///     The small primes
+        /// </summary>
+        internal static readonly int[] SmallPrimes =
+        {
+            2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101,
+            103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199
+        };
     }
 }
diff --git a/ExtendedSystemObjects/ImmutableLookupMap.cs b/ExtendedSystemObjects/ImmutableLookupMap.cs
@@ -134,7 +134,7 @@ public TValue Get(TKey key)
                 }
             }
 
-            throw new KeyNotFoundException(ExtendedSystemObjectsResources.ErrorValueNotFound);
+            throw new KeyNotFoundException(SharedResources.ErrorValueNotFound);
         }
 
         /// <summary>
diff --git a/ExtendedSystemObjects/ImmutableLookupMapUnmanaged.cs b/ExtendedSystemObjects/ImmutableLookupMapUnmanaged.cs
@@ -1,9 +1,19 @@
-﻿using System;
+﻿/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ExtendedSystemObjects
+ * FILE:        ExtendedSystemObjects/ImmutableLookupMap.cs
+ * PURPOSE:     A high-performance, immutable lookup map that uses an array-based internal structure for fast key-value lookups. Tis one is for unmanaged only. It uses my UnmanagedArray.
+ * PROGRAMER:   Peter Geinitz (Wayfarer)
+ */
+
+// ReSharper disable UnusedMember.Global
+// ReSharper disable MemberCanBeInternal
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using ExtendedSystemObjects.Helper;
-using ExtendedSystemObjects.Interfaces;
 
 namespace ExtendedSystemObjects
 {
diff --git a/ExtendedSystemObjects/MultiArray.cs b/ExtendedSystemObjects/MultiArray.cs
@@ -13,6 +13,7 @@
 
 using System;
 using System.Text;
+using ExtendedSystemObjects.Helper;
 
 namespace ExtendedSystemObjects
 {
@@ -85,7 +86,7 @@ public static unsafe string ToText<TValue>(this TValue[,] array) where TValue :
                     }
                     else
                     {
-                        _ = str.Append(ExtendedSystemObjectsResources.Separator);
+                        _ = str.Append(SharedResources.Separator);
                     }
                 }
             }
diff --git a/ExtendedSystemObjects/Utility.cs b/ExtendedSystemObjects/Utility.cs
@@ -15,6 +15,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using ExtendedSystemObjects.Helper;
 
 namespace ExtendedSystemObjects
 {
@@ -187,7 +188,7 @@ public static List<int> GetAvailableIndexes(List<int> lst, int count)
             if (count < 0)
             {
                 throw new ArgumentOutOfRangeException(nameof(count),
-                    ExtendedSystemObjectsResources.ErrorValueNotAllowed);
+                    SharedResources.ErrorValueNotAllowed);
             }
 
             var keys = new List<int>();

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using System.Collections.Generic;`
`17`	`17`	`using System.Linq;`
`18`	`18`	`using System.Threading;`
	`19`	`+using ExtendedSystemObjects.Helper;`
`19`	`20`
`20`	`21`	`namespace ExtendedSystemObjects`
`21`	`22`	`{`
`@@ -381,17 +382,17 @@ public static bool AreEqual<TKey, TValue>(CategorizedDictionary<TKey, TValue> ex`
`381`	`382`	`{`
`382`	`383`	`if (expected == null \|\| actual == null)`
`383`	`384`	`{`
`384`		`- message = ExtendedSystemObjectsResources.NullDictionaries;`
	`385`	`+ message = SharedResources.NullDictionaries;`
`385`	`386`	`return false;`
`386`	`387`	`}`
`387`	`388`
`388`	`389`	`if (expected.Equals(actual))`
`389`	`390`	`{`
`390`		`- message = ExtendedSystemObjectsResources.DictionariesEqual;`
	`391`	`+ message = SharedResources.DictionariesEqual;`
`391`	`392`	`return true;`
`392`	`393`	`}`
`393`	`394`
`394`		`- message = ExtendedSystemObjectsResources.DictionaryComparisonFailed;`
	`395`	`+ message = SharedResources.DictionaryComparisonFailed;`
`395`	`396`	`return false;`
`396`	`397`	`}`
`397`	`398`
`@@ -406,7 +407,7 @@ public override string ToString()`
`406`	`407`	`try`
`407`	`408`	`{`
`408`	`409`	`var entries = _data.Select(entry =>`
`409`		`- string.Format(ExtendedSystemObjectsResources.KeyCategoryValueFormat, entry.Key,`
	`410`	`+ string.Format(SharedResources.KeyCategoryValueFormat, entry.Key,`
`410`	`411`	`entry.Value.Category,`
`411`	`412`	`entry.Value.Value));`
`412`	`413`
`@@ -483,7 +484,7 @@ private void AddInternal(string category, TK key, TV value)`
`483`	`484`	`{`
`484`	`485`	`if (_data.ContainsKey(key))`
`485`	`486`	`{`
`486`		`- throw new ArgumentException($"{ExtendedSystemObjectsResources.ErrorKeyExists}{key}");`
	`487`	`+ throw new ArgumentException($"{SharedResources.ErrorKeyExists}{key}");`
`487`	`488`	`}`
`488`	`489`
`489`	`490`	`_data[key] = (category, value);`
Original file line number	Diff line number	Diff line change
`@@ -130,13 +130,13 @@ public static void AddDistinctKeyValue<TKey, TValue>(this Dictionary<TKey, TValu`
`130`	`130`	`{`
`131`	`131`	`if (dic.ContainsKey(key))`
`132`	`132`	`{`
`133`		`- throw new ArgumentException(string.Concat(ExtendedSystemObjectsResources.ErrorKeyExists,`
	`133`	`+ throw new ArgumentException(string.Concat(SharedResources.ErrorKeyExists,`
`134`	`134`	`nameof(value)));`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if (dic.ContainsValue(value))`
`138`	`138`	`{`
`139`		`- throw new ArgumentException(string.Concat(ExtendedSystemObjectsResources.ErrorValueExists,`
	`139`	`+ throw new ArgumentException(string.Concat(SharedResources.ErrorValueExists,`
`140`	`140`	`nameof(value)));`
`141`	`141`	`}`
`142`	`142`
`@@ -235,7 +235,7 @@ public static TKey GetFirstKeyByValue<TKey, TValue>(this IDictionary<TKey, TValu`
`235`	`235`	`return pair.Key;`
`236`	`236`	`}`
`237`	`237`
`238`		`- throw new ValueNotFoundException(ExtendedSystemObjectsResources.ErrorValueNotFound);`
	`238`	`+ throw new ValueNotFoundException(SharedResources.ErrorValueNotFound);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`/// <summary>`
`@@ -253,7 +253,7 @@ public static List<TKey> GetKeysByValue<TKey, TValue>(this IDictionary<TKey, TVa`
`253`	`253`
`254`	`254`	`if (collection.Count == 0)`
`255`	`255`	`{`
`256`		`- throw new ValueNotFoundException(ExtendedSystemObjectsResources.ErrorValueNotFound);`
	`256`	`+ throw new ValueNotFoundException(SharedResources.ErrorValueNotFound);`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`return collection;`
`@@ -277,7 +277,7 @@ public static Dictionary<TKey, TValue> GetDictionaryByValues<TKey, TValue>(this`
`277`	`277`
`278`	`278`	`if (collection.Count == 0)`
`279`	`279`	`{`
`280`		`- throw new ValueNotFoundException(ExtendedSystemObjectsResources.ErrorNoValueFound);`
	`280`	`+ throw new ValueNotFoundException(SharedResources.ErrorNoValueFound);`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`return collection;`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public TValue Get(TKey key)`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`- throw new KeyNotFoundException(ExtendedSystemObjectsResources.ErrorValueNotFound);`
	`137`	`+ throw new KeyNotFoundException(SharedResources.ErrorValueNotFound);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`using System;`
`15`	`15`	`using System.Text;`
	`16`	`+using ExtendedSystemObjects.Helper;`
`16`	`17`
`17`	`18`	`namespace ExtendedSystemObjects`
`18`	`19`	`{`
`@@ -85,7 +86,7 @@ public static unsafe string ToText<TValue>(this TValue[,] array) where TValue :`
`85`	`86`	`}`
`86`	`87`	`else`
`87`	`88`	`{`
`88`		`- _ = str.Append(ExtendedSystemObjectsResources.Separator);`
	`89`	`+ _ = str.Append(SharedResources.Separator);`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`using System.Diagnostics.CodeAnalysis;`
`16`	`16`	`using System.Linq;`
`17`	`17`	`using System.Runtime.CompilerServices;`
	`18`	`+using ExtendedSystemObjects.Helper;`
`18`	`19`
`19`	`20`	`namespace ExtendedSystemObjects`
`20`	`21`	`{`
`@@ -187,7 +188,7 @@ public static List<int> GetAvailableIndexes(List<int> lst, int count)`
`187`	`188`	`if (count < 0)`
`188`	`189`	`{`
`189`	`190`	`throw new ArgumentOutOfRangeException(nameof(count),`
`190`		`- ExtendedSystemObjectsResources.ErrorValueNotAllowed);`
	`191`	`+ SharedResources.ErrorValueNotAllowed);`
`191`	`192`	`}`
`192`	`193`
`193`	`194`	`var keys = new List<int>();`