From 5a2f969ec2c42bc40cd145a9fe450fd67635b27d Mon Sep 17 00:00:00 2001 From: Tobias Glaubach Date: Tue, 17 Jul 2018 20:23:20 +0200 Subject: [PATCH] renamed TrimTrailingZeros to Trim --- src/Numerics.Tests/PolynomialTests.cs | 12 ++++++------ src/Numerics/Polynomial.cs | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/Numerics.Tests/PolynomialTests.cs b/src/Numerics.Tests/PolynomialTests.cs index 41721553..b4b78eba 100644 --- a/src/Numerics.Tests/PolynomialTests.cs +++ b/src/Numerics.Tests/PolynomialTests.cs @@ -124,8 +124,8 @@ namespace MathNet.Numerics.UnitTests var p_res = Polynomial.Add(p1, p2); var p_tar = new Polynomial(tgt); - p_res.TrimTrailingZeros(); - p_tar.TrimTrailingZeros(); + p_res.Trim(); + p_tar.Trim(); Assert.AreEqual(p_tar.Degree, p_res.Degree, "length mismatch"); for (int k = 0; k < p_res.Degree; k++) @@ -161,8 +161,8 @@ namespace MathNet.Numerics.UnitTests var p_res = Polynomial.Substract(p1, p2); var p_tar = new Polynomial(tgt); - p_res.TrimTrailingZeros(); - p_tar.TrimTrailingZeros(); + p_res.Trim(); + p_tar.Trim(); Assert.AreEqual(p_tar.Degree, p_res.Degree, "length mismatch"); for (int k = 0; k < p_res.Degree; k++) @@ -197,8 +197,8 @@ namespace MathNet.Numerics.UnitTests var p_res = p1 * p2; var p_tar = new Polynomial(tgt); - p_res.TrimTrailingZeros(); - p_tar.TrimTrailingZeros(); + p_res.Trim(); + p_tar.Trim(); Assert.AreEqual(p_tar.Degree, p_res.Degree, "length mismatch"); for (int k = 0; k < p_res.Degree; k++) diff --git a/src/Numerics/Polynomial.cs b/src/Numerics/Polynomial.cs index 1abd363f..3213a5b3 100644 --- a/src/Numerics/Polynomial.cs +++ b/src/Numerics/Polynomial.cs @@ -118,7 +118,7 @@ namespace MathNet.Numerics /// /// remove all trailing zeros, e.G before: "0.00 x^2 + 1.0 x^1 + 1.00" after: "1.0 x^1 + 1.00" /// - public void TrimTrailingZeros() + public void Trim() { int count = 0; for (int ii = Degree - 1; ii >= 0; ii--) @@ -138,6 +138,7 @@ namespace MathNet.Numerics } } } + #region Data Interaction @@ -185,28 +186,28 @@ namespace MathNet.Numerics } var t = this.Clone() as Polynomial; - t.TrimTrailingZeros(); + t.Trim(); var cNew = new double[t.Coeffs.Length - 1]; for (int i = 1; i < t.Coeffs.Length; i++) { cNew[i-1] = t.Coeffs[i] * i; } var p = new Polynomial(cNew, isFlip: IsFlipped); - p.TrimTrailingZeros(); + p.Trim(); return p; } public Polynomial Integrate() { var t = this.Clone() as Polynomial; - t.TrimTrailingZeros(); + t.Trim(); var cNew = new double[t.Coeffs.Length + 1]; for (int i = 1; i < cNew.Length; i++) { cNew[i] = t.Coeffs[i-1] / i; } var p = new Polynomial(cNew, isFlip: IsFlipped); - p.TrimTrailingZeros(); + p.Trim(); return p; } @@ -224,13 +225,13 @@ namespace MathNet.Numerics public static Polynomial operator *( Polynomial a, Polynomial b) { // do not cut trailing zeros, since it may corrupt the outcom, if the array is of form 1 + x^-1 + x^-2 + x^-3 - //a.TrimTrailingZeros(); - //b.TrimTrailingZeros(); + //a.Trim(); + //b.Trim(); double[] ret = conv(a.Coeffs, b.Coeffs); Polynomial ret_p = new Polynomial(ret); - //ret_p.TrimTrailingZeros(); + //ret_p.Trim(); return (ret_p); @@ -346,7 +347,7 @@ namespace MathNet.Numerics public DenseMatrix GetEigValMatrix() { Polynomial pLoc = new Polynomial(this.Coeffs); - pLoc.TrimTrailingZeros(); + pLoc.Trim(); int n = pLoc.Coeffs.Length - 1; if (n < 2) @@ -549,8 +550,8 @@ namespace MathNet.Numerics // output mapping var pQuo = new Polynomial(quo); var pRem = new Polynomial(rem); - pQuo.TrimTrailingZeros(); - pQuo.TrimTrailingZeros(); + pQuo.Trim(); + pQuo.Trim(); return new Tuple(pQuo, pRem); }