diff --git a/src/Managed.UnitTests/InterpolationTests/InterpolationTest.cs b/src/Managed.UnitTests/InterpolationTests/InterpolationTest.cs index 12070189..62f14632 100644 --- a/src/Managed.UnitTests/InterpolationTests/InterpolationTest.cs +++ b/src/Managed.UnitTests/InterpolationTests/InterpolationTest.cs @@ -40,16 +40,16 @@ namespace MathNet.Numerics.UnitTests.InterpolationTests [VerifyContract] public readonly IContract LinearSplineContractTests = new InterpolationContract() { - Factory = Interpolation.CreateLinearBetweenPoints, + Factory = Interpolate.LinearBetweenPoints, Order = new[] { 2, 3, 6 }, PolynomialBehavior = false, RationalBehavior = false }; [VerifyContract] - public readonly IContract RationalPoleFreeContractTests = new InterpolationContract() + public readonly IContract FloaterHormannRationalContractTests = new InterpolationContract() { - Factory = Interpolation.CreateRationalPoleFree, + Factory = Interpolate.RationalWithoutPoles, Order = new[] { 1, 2, 6 }, PolynomialBehavior = true, RationalBehavior = true diff --git a/src/Managed/Interpolation/Algorithms/RationalPoleFreeInterpolation.cs b/src/Managed/Interpolation/Algorithms/FloaterHormannRationalInterpolation.cs similarity index 95% rename from src/Managed/Interpolation/Algorithms/RationalPoleFreeInterpolation.cs rename to src/Managed/Interpolation/Algorithms/FloaterHormannRationalInterpolation.cs index 8a809374..84aa973b 100644 --- a/src/Managed/Interpolation/Algorithms/RationalPoleFreeInterpolation.cs +++ b/src/Managed/Interpolation/Algorithms/FloaterHormannRationalInterpolation.cs @@ -1,4 +1,4 @@ -// +// // Math.NET Numerics, part of the Math.NET Project // http://mathnet.opensourcedotnet.info // @@ -37,7 +37,7 @@ namespace MathNet.Numerics.Interpolation.Algorithms /// /// This algorithm neither supports differentiation nor integration. /// - public class RationalPoleFreeInterpolation : IInterpolation + public class FloaterHormannRationalInterpolation : IInterpolation { /// /// Internal Barycentric Interpolation @@ -45,19 +45,19 @@ namespace MathNet.Numerics.Interpolation.Algorithms private readonly BarycentricInterpolation _barycentric; /// - /// Initializes a new instance of the RationalPoleFreeInterpolation class. + /// Initializes a new instance of the FloaterHormannRationalInterpolation class. /// - public RationalPoleFreeInterpolation() + public FloaterHormannRationalInterpolation() { _barycentric = new BarycentricInterpolation(); } /// - /// Initializes a new instance of the RationalPoleFreeInterpolation class. + /// Initializes a new instance of the FloaterHormannRationalInterpolation class. /// /// Sample Points t /// Sample Values x(t) - public RationalPoleFreeInterpolation( + public FloaterHormannRationalInterpolation( IList samplePoints, IList sampleValues) { diff --git a/src/Managed/Interpolation/Interpolation.cs b/src/Managed/Interpolation/Interpolate.cs similarity index 87% rename from src/Managed/Interpolation/Interpolation.cs rename to src/Managed/Interpolation/Interpolate.cs index 16a5813d..75da3c7c 100644 --- a/src/Managed/Interpolation/Interpolation.cs +++ b/src/Managed/Interpolation/Interpolate.cs @@ -1,4 +1,4 @@ -// +// // Math.NET Numerics, part of the Math.NET Project // http://mathnet.opensourcedotnet.info // @@ -34,7 +34,7 @@ namespace MathNet.Numerics.Interpolation /// /// Interpolation Factory. /// - public static class Interpolation + public static class Interpolate { /// /// Creates an interpolation based on arbitrary points. @@ -46,11 +46,11 @@ namespace MathNet.Numerics.Interpolation /// which can then be used to compute interpolations and extrapolations /// on arbitrary points. /// - public static IInterpolation Create( + public static IInterpolation Common( IList points, IList values) { - return CreateRationalPoleFree(points, values); + return RationalWithoutPoles(points, values); } /// @@ -63,7 +63,7 @@ namespace MathNet.Numerics.Interpolation /// which can then be used to compute interpolations and extrapolations /// on arbitrary points. /// - public static IInterpolation CreateLinearBetweenPoints( + public static IInterpolation LinearBetweenPoints( IList points, IList values) { @@ -73,7 +73,7 @@ namespace MathNet.Numerics.Interpolation } /// - /// Create a rational pole-free interpolation based on arbitrary points. + /// Create a floater hormann rational pole-free interpolation based on arbitrary points. /// /// The sample points t. Supports both lists and arrays. /// The sample point values x(t). Supports both lists and arrays. @@ -82,11 +82,11 @@ namespace MathNet.Numerics.Interpolation /// which can then be used to compute interpolations and extrapolations /// on arbitrary points. /// - public static IInterpolation CreateRationalPoleFree( + public static IInterpolation RationalWithoutPoles( IList points, IList values) { - RationalPoleFreeInterpolation method = new RationalPoleFreeInterpolation(); + FloaterHormannRationalInterpolation method = new FloaterHormannRationalInterpolation(); method.Initialize(points, values); return method; } diff --git a/src/Managed/Managed.csproj b/src/Managed/Managed.csproj index 58e0c140..ff36bae7 100644 --- a/src/Managed/Managed.csproj +++ b/src/Managed/Managed.csproj @@ -55,12 +55,12 @@ + - - + diff --git a/src/Native/Native.csproj b/src/Native/Native.csproj index 96fd2a76..2c1393ed 100644 --- a/src/Native/Native.csproj +++ b/src/Native/Native.csproj @@ -74,23 +74,23 @@ Interpolation\Algorithms\BarycentricInterpolation.cs + + Interpolation\Algorithms\FloaterHormannRationalInterpolation.cs + Interpolation\Algorithms\LinearSplineInterpolation.cs Interpolation\Algorithms\NevillePolynomialInterpolation.cs - - Interpolation\Algorithms\RationalPoleFreeInterpolation.cs - Interpolation\Algorithms\SplineInterpolation.cs Interpolation\IInterpolation.cs - - Interpolation\Interpolation.cs + + Interpolation\Interpolate.cs Precision.cs