[Random] Add thread-safe Shared property

dotnet/runtime#50297
hikarin522 · Dec 9, 2021 · f132aa5 · f132aa5
1 parent 3d398fa
commit f132aa5
Show file tree

Hide file tree

Showing 54 changed files with 347 additions and 254 deletions.
diff --git a/src/Numerics.Tests/DistributionTests/CommonDistributionTests.cs b/src/Numerics.Tests/DistributionTests/CommonDistributionTests.cs
@@ -106,13 +106,13 @@ public void HasRandomSourceContinuous(IContinuousDistribution distribution)
         [Test, TestCaseSource(nameof(DiscreteDistributions))]
         public void CanSetRandomSourceDiscrete(IDiscreteDistribution distribution)
         {
-            distribution.RandomSource = MersenneTwister.Default;
+            distribution.RandomSource = MersenneTwister.Shared;
         }
 
         [Test, TestCaseSource(nameof(ContinuousDistributions))]
         public void CanSetRandomSourceContinuous(IContinuousDistribution distribution)
         {
-            distribution.RandomSource = MersenneTwister.Default;
+            distribution.RandomSource = MersenneTwister.Shared;
         }
 
         [Test, TestCaseSource(nameof(DiscreteDistributions))]

diff --git a/src/Numerics/Combinatorics.cs b/src/Numerics/Combinatorics.cs
@@ -153,7 +153,7 @@ public static int[] GeneratePermutation(int n, System.Random randomSource = null
         /// <param name="randomSource">The random number generator to use. Optional; the default random source will be used if null.</param>
         public static void SelectPermutationInplace<T>(T[] data, System.Random randomSource = null)
         {
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
 
             // Fisher-Yates Shuffling
             for (int i = data.Length - 1; i > 0; i--)
@@ -173,7 +173,7 @@ public static void SelectPermutationInplace<T>(T[] data, System.Random randomSou
         /// <param name="randomSource">The random number generator to use. Optional; the default random source will be used if null.</param>
         public static IEnumerable<T> SelectPermutation<T>(this IEnumerable<T> data, System.Random randomSource = null)
         {
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
             T[] array = data.ToArray();
 
             // Fisher-Yates Shuffling
@@ -195,7 +195,7 @@ public static bool[] GenerateCombination(int n, System.Random randomSource = nul
         {
             if (n < 0) throw new ArgumentOutOfRangeException(nameof(n), "Value must not be negative (zero is ok).");
 
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
 
             bool[] mask = new bool[n];
             for (int i = 0; i < mask.Length; i++)
@@ -219,7 +219,7 @@ public static bool[] GenerateCombination(int n, int k, System.Random randomSourc
             if (k < 0) throw new ArgumentOutOfRangeException(nameof(k), "Value must not be negative (zero is ok).");
             if (k > n) throw new ArgumentOutOfRangeException(nameof(k), $"{"k"} must be smaller than or equal to {"n"}.");
 
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
 
             bool[] mask = new bool[n];
             if (k*3 < n)
@@ -286,7 +286,7 @@ public static int[] GenerateCombinationWithRepetition(int n, int k, System.Rando
             if (n < 0) throw new ArgumentOutOfRangeException(nameof(n), "Value must not be negative (zero is ok).");
             if (k < 0) throw new ArgumentOutOfRangeException(nameof(k), "Value must not be negative (zero is ok).");
 
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
 
             int[] mask = new int[n];
             for (int i = 0; i < k; i++)
@@ -334,7 +334,7 @@ public static int[] GenerateVariation(int n, int k, System.Random randomSource =
             if (k < 0) throw new ArgumentOutOfRangeException(nameof(k), "Value must not be negative (zero is ok).");
             if (k > n) throw new ArgumentOutOfRangeException(nameof(k), $"k must be smaller than or equal to n.");
 
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
 
             int[] indices = new int[n];
             for (int i = 0; i < indices.Length; i++)
@@ -364,7 +364,7 @@ public static int[] GenerateVariation(int n, int k, System.Random randomSource =
         /// <returns>The chosen variation, in random order.</returns>
         public static IEnumerable<T> SelectVariation<T>(this IEnumerable<T> data, int elementsToChoose, System.Random randomSource = null)
         {
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
             T[] array = data.ToArray();
 
             if (elementsToChoose < 0) throw new ArgumentOutOfRangeException(nameof(elementsToChoose), "Value must not be negative (zero is ok).");
@@ -391,7 +391,7 @@ public static int[] GenerateVariationWithRepetition(int n, int k, System.Random
             if (n < 0) throw new ArgumentOutOfRangeException(nameof(n), "Value must not be negative (zero is ok).");
             if (k < 0) throw new ArgumentOutOfRangeException(nameof(k), "Value must not be negative (zero is ok).");
 
-            var random = randomSource ?? SystemRandomSource.Default;
+            var random = randomSource ?? SystemRandomSource.Shared;
 
             int[] ret = new int[k];
             random.NextInt32s(ret, 0, n);

diff --git a/src/Numerics/Distributions/Bernoulli.cs b/src/Numerics/Distributions/Bernoulli.cs
@@ -59,7 +59,7 @@ public Bernoulli(double p)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = SystemRandomSource.Default;
+            _random = SystemRandomSource.Shared;
             _p = p;
         }
 
@@ -76,7 +76,7 @@ public Bernoulli(double p, System.Random randomSource)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = randomSource ?? SystemRandomSource.Default;
+            _random = randomSource ?? SystemRandomSource.Shared;
             _p = p;
         }
 
@@ -109,7 +109,7 @@ public static bool IsValidParameterSet(double p)
         public System.Random RandomSource
         {
             get => _random;
-            set => _random = value ?? SystemRandomSource.Default;
+            set => _random = value ?? SystemRandomSource.Shared;
         }
 
         /// <summary>
@@ -417,7 +417,7 @@ public static int Sample(double p)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SampleUnchecked(SystemRandomSource.Default, p);
+            return SampleUnchecked(SystemRandomSource.Shared, p);
         }
 
         /// <summary>
@@ -432,7 +432,7 @@ public static IEnumerable<int> Samples(double p)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SamplesUnchecked(SystemRandomSource.Default, p);
+            return SamplesUnchecked(SystemRandomSource.Shared, p);
         }
 
         /// <summary>
@@ -448,7 +448,7 @@ public static void Samples(int[] values, double p)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            SamplesUnchecked(SystemRandomSource.Default, values, p);
+            SamplesUnchecked(SystemRandomSource.Shared, values, p);
         }
     }
 }
diff --git a/src/Numerics/Distributions/Beta.cs b/src/Numerics/Distributions/Beta.cs
@@ -67,7 +67,7 @@ public Beta(double a, double b)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = SystemRandomSource.Default;
+            _random = SystemRandomSource.Shared;
             _shapeA = a;
             _shapeB = b;
         }
@@ -85,7 +85,7 @@ public Beta(double a, double b, System.Random randomSource)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = randomSource ?? SystemRandomSource.Default;
+            _random = randomSource ?? SystemRandomSource.Shared;
             _shapeA = a;
             _shapeB = b;
         }
@@ -125,7 +125,7 @@ public static bool IsValidParameterSet(double a, double b)
         public System.Random RandomSource
         {
             get => _random;
-            set => _random = value ?? SystemRandomSource.Default;
+            set => _random = value ?? SystemRandomSource.Shared;
         }
 
         /// <summary>
@@ -703,7 +703,7 @@ public static double Sample(double a, double b)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SampleUnchecked(SystemRandomSource.Default, a, b);
+            return SampleUnchecked(SystemRandomSource.Shared, a, b);
         }
 
         /// <summary>
@@ -719,7 +719,7 @@ public static IEnumerable<double> Samples(double a, double b)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SamplesUnchecked(SystemRandomSource.Default, a, b);
+            return SamplesUnchecked(SystemRandomSource.Shared, a, b);
         }
 
         /// <summary>
@@ -736,7 +736,7 @@ public static void Samples(double[] values, double a, double b)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            SamplesUnchecked(SystemRandomSource.Default, values, a, b);
+            SamplesUnchecked(SystemRandomSource.Shared, values, a, b);
         }
     }
 }
diff --git a/src/Numerics/Distributions/BetaBinomial.cs b/src/Numerics/Distributions/BetaBinomial.cs
@@ -67,7 +67,7 @@ public BetaBinomial(int n, double a, double b)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = SystemRandomSource.Default;
+            _random = SystemRandomSource.Shared;
             _n = n;
             _a = a;
             _b = b;
@@ -87,7 +87,7 @@ public BetaBinomial(int n, double a, double b, System.Random randomSource)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = randomSource ?? SystemRandomSource.Default;
+            _random = randomSource ?? SystemRandomSource.Shared;
             _n = n;
             _a = a;
             _b = b;
@@ -135,7 +135,7 @@ public static bool IsValidParameterSet(int n, double a, double b, int k)
         public System.Random RandomSource
         {
             get => _random;
-            set => _random = value ?? SystemRandomSource.Default;
+            set => _random = value ?? SystemRandomSource.Shared;
         }
         /// <summary>
         /// Gets the mean of the distribution.

diff --git a/src/Numerics/Distributions/BetaScaled.cs b/src/Numerics/Distributions/BetaScaled.cs
@@ -57,7 +57,7 @@ public BetaScaled(double a, double b, double location, double scale)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = SystemRandomSource.Default;
+            _random = SystemRandomSource.Shared;
             _shapeA = a;
             _shapeB = b;
             _location = location;
@@ -79,7 +79,7 @@ public BetaScaled(double a, double b, double location, double scale, System.Rand
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = randomSource ?? SystemRandomSource.Default;
+            _random = randomSource ?? SystemRandomSource.Shared;
             _shapeA = a;
             _shapeB = b;
             _location = location;
@@ -176,7 +176,7 @@ public static bool IsValidParameterSet(double a, double b, double location, doub
         public System.Random RandomSource
         {
             get => _random;
-            set => _random = value ?? SystemRandomSource.Default;
+            set => _random = value ?? SystemRandomSource.Shared;
         }
 
         /// <summary>
@@ -553,7 +553,7 @@ public static double Sample(double a, double b, double location, double scale)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SampleUnchecked(SystemRandomSource.Default, a, b, location, scale);
+            return SampleUnchecked(SystemRandomSource.Shared, a, b, location, scale);
         }
 
         /// <summary>
@@ -571,7 +571,7 @@ public static IEnumerable<double> Samples(double a, double b, double location, d
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SamplesUnchecked(SystemRandomSource.Default, a, b, location, scale);
+            return SamplesUnchecked(SystemRandomSource.Shared, a, b, location, scale);
         }
 
         /// <summary>
@@ -590,7 +590,7 @@ public static void Samples(double[] values, double a, double b, double location,
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            SamplesUnchecked(SystemRandomSource.Default, values, a, b, location, scale);
+            SamplesUnchecked(SystemRandomSource.Shared, values, a, b, location, scale);
         }
     }
 }
diff --git a/src/Numerics/Distributions/Binomial.cs b/src/Numerics/Distributions/Binomial.cs
@@ -63,7 +63,7 @@ public Binomial(double p, int n)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = SystemRandomSource.Default;
+            _random = SystemRandomSource.Shared;
             _p = p;
             _trials = n;
         }
@@ -83,7 +83,7 @@ public Binomial(double p, int n, System.Random randomSource)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            _random = randomSource ?? SystemRandomSource.Default;
+            _random = randomSource ?? SystemRandomSource.Shared;
             _p = p;
             _trials = n;
         }
@@ -123,7 +123,7 @@ public static bool IsValidParameterSet(double p, int n)
         public System.Random RandomSource
         {
             get => _random;
-            set => _random = value ?? SystemRandomSource.Default;
+            set => _random = value ?? SystemRandomSource.Shared;
         }
 
         /// <summary>
@@ -487,7 +487,7 @@ public static int Sample(double p, int n)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SampleUnchecked(SystemRandomSource.Default, p, n);
+            return SampleUnchecked(SystemRandomSource.Shared, p, n);
         }
 
         /// <summary>
@@ -503,7 +503,7 @@ public static IEnumerable<int> Samples(double p, int n)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            return SamplesUnchecked(SystemRandomSource.Default, p, n);
+            return SamplesUnchecked(SystemRandomSource.Shared, p, n);
         }
 
         /// <summary>
@@ -520,7 +520,7 @@ public static void Samples(int[] values, double p, int n)
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
 
-            SamplesUnchecked(SystemRandomSource.Default, values, p, n);
+            SamplesUnchecked(SystemRandomSource.Shared, values, p, n);
         }
     }
 }
diff --git a/src/Numerics/Distributions/Burr.cs b/src/Numerics/Distributions/Burr.cs
@@ -65,7 +65,7 @@ public Burr(double a, double c, double k, System.Random randomSource = null)
             {
                 throw new ArgumentException("Invalid parametrization for the distribution.");
             }
-            _random = randomSource ?? SystemRandomSource.Default;
+            _random = randomSource ?? SystemRandomSource.Shared;
             A = a;
             C = c;
             K = k;
@@ -98,7 +98,7 @@ public static bool IsValidParameterSet(double a, double c, double k)
         public System.Random RandomSource
         {
             get => _random;
-            set => _random = value ?? SystemRandomSource.Default;
+            set => _random = value ?? SystemRandomSource.Shared;
         }
 
         /// <summary>