diff --git a/src/Numerics/Fit.cs b/src/Numerics/Fit.cs index 6b520886..a0f0088f 100644 --- a/src/Numerics/Fit.cs +++ b/src/Numerics/Fit.cs @@ -143,7 +143,7 @@ namespace MathNet.Numerics /// Least-Squares fitting the points (X,y) = ((x0,x1,..,xk),y) to an arbitrary linear combination y : X -> p0*f0(x0) + p1*f1(x1) + ... + pk*fk(xk), /// returning its best fitting parameters as [p0, p1, p2, ..., pk] array. /// - public static double[] MultiDimensional(double[][] x, double[] y, params Func[] functions) + public static double[] LinearMultiDim(double[][] x, double[] y, params Func[] functions) { return DenseMatrix .OfRows(x.Length, functions.Length, x.Select(xi => functions.Select((f, k) => f(xi[k])))) @@ -155,9 +155,9 @@ namespace MathNet.Numerics /// Least-Squares fitting the points (X,y) = ((x0,x1,..,xk),y) to an arbitrary linear combination y : X -> p0*f0(x0) + p1*f1(x1) + ... + pk*fk(xk), /// returning a function y' for the best fitting combination. /// - public static Func MultiDimensionalFunc(double[][] x, double[] y, params Func[] functions) + public static Func LinearMultiDimFunc(double[][] x, double[] y, params Func[] functions) { - var parameters = MultiDimensional(x, y, functions); + var parameters = LinearMultiDim(x, y, functions); return z => functions.Select((f, i) => parameters[i]*f(z[i])).Sum(); } @@ -165,7 +165,7 @@ namespace MathNet.Numerics /// Least-Squares fitting the points (X,y) = ((x0,x1,..,xk),y) to an arbitrary linear combination y : X -> p0*f0(x0) + p1*f1(x1) + ... + pk*fk(xk), /// returning its best fitting parameters as [p0, p1, p2, ..., pk] array. /// - public static Vector Vector(Vector[] x, double[] y, Func, Vector> functions) + public static Vector LinearVector(Vector[] x, double[] y, Func, Vector> functions) { return DenseMatrix .OfRowVectors(x.Select(functions).ToArray()) // PERF: Array.map instead of seq @@ -176,9 +176,9 @@ namespace MathNet.Numerics /// Least-Squares fitting the points (X,y) = ((x0,x1,..,xk),y) to an arbitrary linear combination y : X -> p0*f0(x0) + p1*f1(x1) + ... + pk*fk(xk), /// returning a function y' for the best fitting combination. /// - public static Func, double> VectorFunc(Vector[] x, double[] y, Func, Vector> functions) + public static Func, double> LinearVectorFunc(Vector[] x, double[] y, Func, Vector> functions) { - var parameters = Vector(x, y, functions); + var parameters = LinearVector(x, y, functions); return z => functions(z).Select((yi, i) => parameters[i]*yi).Sum(); } }