diff --git a/src/Numerics/RootFinding/RealRoots.cs b/src/Numerics/FindRoots.cs similarity index 92% rename from src/Numerics/RootFinding/RealRoots.cs rename to src/Numerics/FindRoots.cs index c9eb0b5e..1ad86be3 100644 --- a/src/Numerics/RootFinding/RealRoots.cs +++ b/src/Numerics/FindRoots.cs @@ -1,4 +1,4 @@ -// +// // Math.NET Numerics, part of the Math.NET Project // http://numerics.mathdotnet.com // http://github.com/mathnet/mathnet-numerics @@ -29,11 +29,11 @@ // using System; -using MathNet.Numerics.RootFinding.Algorithms; +using MathNet.Numerics.RootFinding; -namespace MathNet.Numerics.RootFinding +namespace MathNet.Numerics { - public static class RealRoots + public static class FindRoots { public static double OfFunction(Func f, double lowerBound, double upperBound, double accuracy = 1e-8) { diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 5c66530f..6ec92b7f 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -111,11 +111,11 @@ - - - - - + + + + + diff --git a/src/Numerics/RootFinding/Algorithms/Bisection.cs b/src/Numerics/RootFinding/Bisection.cs similarity index 98% rename from src/Numerics/RootFinding/Algorithms/Bisection.cs rename to src/Numerics/RootFinding/Bisection.cs index 5ad802d1..739b26e6 100644 --- a/src/Numerics/RootFinding/Algorithms/Bisection.cs +++ b/src/Numerics/RootFinding/Bisection.cs @@ -31,7 +31,7 @@ using System; using MathNet.Numerics.Properties; -namespace MathNet.Numerics.RootFinding.Algorithms +namespace MathNet.Numerics.RootFinding { public static class Bisection { diff --git a/src/Numerics/RootFinding/Algorithms/Brent.cs b/src/Numerics/RootFinding/Brent.cs similarity index 99% rename from src/Numerics/RootFinding/Algorithms/Brent.cs rename to src/Numerics/RootFinding/Brent.cs index 32f982a2..524e600f 100644 --- a/src/Numerics/RootFinding/Algorithms/Brent.cs +++ b/src/Numerics/RootFinding/Brent.cs @@ -30,7 +30,7 @@ using System; -namespace MathNet.Numerics.RootFinding.Algorithms +namespace MathNet.Numerics.RootFinding { public static class Brent { diff --git a/src/Numerics/RootFinding/Algorithms/HybridNewtonRaphson.cs b/src/Numerics/RootFinding/HybridNewtonRaphson.cs similarity index 99% rename from src/Numerics/RootFinding/Algorithms/HybridNewtonRaphson.cs rename to src/Numerics/RootFinding/HybridNewtonRaphson.cs index 1a3a1325..a76ac9a1 100644 --- a/src/Numerics/RootFinding/Algorithms/HybridNewtonRaphson.cs +++ b/src/Numerics/RootFinding/HybridNewtonRaphson.cs @@ -30,7 +30,7 @@ using System; -namespace MathNet.Numerics.RootFinding.Algorithms +namespace MathNet.Numerics.RootFinding { public static class HybridNewtonRaphson { diff --git a/src/Numerics/RootFinding/Algorithms/ZeroCrossingBracketing.cs b/src/Numerics/RootFinding/ZeroCrossingBracketing.cs similarity index 98% rename from src/Numerics/RootFinding/Algorithms/ZeroCrossingBracketing.cs rename to src/Numerics/RootFinding/ZeroCrossingBracketing.cs index 600449cf..da20c3c2 100644 --- a/src/Numerics/RootFinding/Algorithms/ZeroCrossingBracketing.cs +++ b/src/Numerics/RootFinding/ZeroCrossingBracketing.cs @@ -32,7 +32,7 @@ using System; using System.Collections.Generic; using MathNet.Numerics.Properties; -namespace MathNet.Numerics.RootFinding.Algorithms +namespace MathNet.Numerics.RootFinding { public static class ZeroCrossingBracketing { diff --git a/src/Portable/Portable.csproj b/src/Portable/Portable.csproj index 1249d03f..7c94f354 100644 --- a/src/Portable/Portable.csproj +++ b/src/Portable/Portable.csproj @@ -198,6 +198,9 @@ Financial\AbsoluteRiskMeasures.cs + + FindRoots.cs + Fit.cs @@ -987,20 +990,17 @@ Random\Xorshift.cs - - RootFinding\Algorithms\Bisection.cs - - - RootFinding\Algorithms\Brent.cs + + RootFinding\Bisection.cs - - RootFinding\Algorithms\HybridNewtonRaphson.cs + + RootFinding\Brent.cs - - RootFinding\Algorithms\ZeroCrossingBracketing.cs + + RootFinding\HybridNewtonRaphson.cs - - RootFinding\RealRoots.cs + + RootFinding\ZeroCrossingBracketing.cs SerializableAttribute.cs diff --git a/src/UnitTests/RootFindingTests/BisectionTest.cs b/src/UnitTests/RootFindingTests/BisectionTest.cs index 99650e3c..edc07c07 100644 --- a/src/UnitTests/RootFindingTests/BisectionTest.cs +++ b/src/UnitTests/RootFindingTests/BisectionTest.cs @@ -29,7 +29,7 @@ // using System; -using MathNet.Numerics.RootFinding.Algorithms; +using MathNet.Numerics.RootFinding; using NUnit.Framework; namespace MathNet.Numerics.UnitTests.RootFindingTests diff --git a/src/UnitTests/RootFindingTests/BrentTest.cs b/src/UnitTests/RootFindingTests/BrentTest.cs index 2b4176db..345f5e32 100644 --- a/src/UnitTests/RootFindingTests/BrentTest.cs +++ b/src/UnitTests/RootFindingTests/BrentTest.cs @@ -29,7 +29,7 @@ // using System; -using MathNet.Numerics.RootFinding.Algorithms; +using MathNet.Numerics.RootFinding; using NUnit.Framework; namespace MathNet.Numerics.UnitTests.RootFindingTests diff --git a/src/UnitTests/RootFindingTests/NewtonRaphsonTest.cs b/src/UnitTests/RootFindingTests/NewtonRaphsonTest.cs index c01fd3da..a2a0da79 100644 --- a/src/UnitTests/RootFindingTests/NewtonRaphsonTest.cs +++ b/src/UnitTests/RootFindingTests/NewtonRaphsonTest.cs @@ -30,7 +30,6 @@ using System; using MathNet.Numerics.RootFinding; -using MathNet.Numerics.RootFinding.Algorithms; using NUnit.Framework; namespace MathNet.Numerics.UnitTests.RootFindingTests @@ -77,13 +76,13 @@ namespace MathNet.Numerics.UnitTests.RootFindingTests Func df1 = x => -1/(x*x - 4*x + 4); Assert.AreEqual(1.5, HybridNewtonRaphson.FindRoot(f1, df1, 1, 2, 1e-14, 100, 20)); Assert.AreEqual(1.5, HybridNewtonRaphson.FindRoot(f1, df1, 1, 6, 1e-14, 100, 20)); - Assert.AreEqual(1.5, RealRoots.OfFunctionAndDerivative(f1, df1, 1, 6)); + Assert.AreEqual(1.5, FindRoots.OfFunctionAndDerivative(f1, df1, 1, 6)); Func f2 = x => -1/(x - 2) + 2; Func df2 = x => 1/(x*x - 4*x + 4); Assert.AreEqual(2.5, HybridNewtonRaphson.FindRoot(f2, df2, 2, 3, 1e-14, 100, 20)); Assert.AreEqual(2.5, HybridNewtonRaphson.FindRoot(f2, df2, -2, 3, 1e-14, 100, 20)); - Assert.AreEqual(2.5, RealRoots.OfFunctionAndDerivative(f2, df2, -2, 3)); + Assert.AreEqual(2.5, FindRoots.OfFunctionAndDerivative(f2, df2, -2, 3)); Func f3 = x => 1/(x - 2) + x + 2; Func df3 = x => -1/(x*x - 4*x + 4) + 1;