diff --git a/src/FSharp/Distributions.fs b/src/FSharp/Distributions.fs index f7da0267..c925b1c7 100644 --- a/src/FSharp/Distributions.fs +++ b/src/FSharp/Distributions.fs @@ -36,7 +36,7 @@ open MathNet.Numerics.Random [] module Distributions = - let withRandom random (dist:#IDistribution) = + let withRandom random (dist:#IUnivariateDistribution) = dist.RandomSource <- random dist diff --git a/src/Numerics/Distributions/IContinuousDistribution.cs b/src/Numerics/Distributions/IContinuousDistribution.cs index 419612da..d7c4b7d4 100644 --- a/src/Numerics/Distributions/IContinuousDistribution.cs +++ b/src/Numerics/Distributions/IContinuousDistribution.cs @@ -35,7 +35,7 @@ namespace MathNet.Numerics.Distributions /// /// The interface for continuous univariate distributions. /// - public interface IContinuousDistribution : IDistribution + public interface IContinuousDistribution : IUnivariateDistribution { /// /// Gets the mode of the distribution. diff --git a/src/Numerics/Distributions/IDiscreteDistribution.cs b/src/Numerics/Distributions/IDiscreteDistribution.cs index 2baa34ba..1e23abbd 100644 --- a/src/Numerics/Distributions/IDiscreteDistribution.cs +++ b/src/Numerics/Distributions/IDiscreteDistribution.cs @@ -35,7 +35,7 @@ namespace MathNet.Numerics.Distributions /// /// The interface for discrete univariate distributions. /// - public interface IDiscreteDistribution : IDistribution + public interface IDiscreteDistribution : IUnivariateDistribution { /// /// Gets the mode of the distribution. diff --git a/src/Numerics/Distributions/IDistribution.cs b/src/Numerics/Distributions/IUnivariateDistribution.cs similarity index 95% rename from src/Numerics/Distributions/IDistribution.cs rename to src/Numerics/Distributions/IUnivariateDistribution.cs index c42b4ef3..6244044e 100644 --- a/src/Numerics/Distributions/IDistribution.cs +++ b/src/Numerics/Distributions/IUnivariateDistribution.cs @@ -1,4 +1,4 @@ -// +// // Math.NET Numerics, part of the Math.NET Project // http://numerics.mathdotnet.com // http://github.com/mathnet/mathnet-numerics @@ -35,7 +35,7 @@ namespace MathNet.Numerics.Distributions /// /// The interface for univariate distributions. /// - public interface IDistribution + public interface IUnivariateDistribution { /// /// Gets or sets the random number generator which is used to generate random samples from the distribution. diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 079bad4c..f2c191a8 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -394,7 +394,7 @@ - + diff --git a/src/UnitTests/DistributionTests/CommonDistributionTests.cs b/src/UnitTests/DistributionTests/CommonDistributionTests.cs index e921b6d2..a964c45e 100644 --- a/src/UnitTests/DistributionTests/CommonDistributionTests.cs +++ b/src/UnitTests/DistributionTests/CommonDistributionTests.cs @@ -240,7 +240,7 @@ namespace MathNet.Numerics.UnitTests.DistributionTests /// The error probability we are willing to tolerate. /// The samples to use for testing. /// The distribution we are testing. - public static void VapnikChervonenkisTest(double epsilon, double delta, IEnumerable s, IDistribution dist) + public static void VapnikChervonenkisTest(double epsilon, double delta, IEnumerable s, IUnivariateDistribution dist) { // Using VC-dimension, we can bound the probability of making an error when estimating empirical probability // distributions. We are using Theorem 2.41 in "All Of Nonparametric Statistics".