From 3992a32123e2984c0d2eaff8f14d10c7b5fd2a8c Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sat, 1 Mar 2014 11:55:08 +0100 Subject: [PATCH] Tests: more consistent naming in AssertHelpers --- src/UnitTests/AssertHelpers.cs | 16 ++++++++-------- .../IntegralTransformsTests/HartleyTest.cs | 2 +- .../InverseTransformTest.cs | 12 ++++++------ .../MatchingNaiveTransformTest.cs | 2 +- .../Complex/Factorization/EvdTests.cs | 8 ++++---- .../Complex32/Factorization/EvdTests.cs | 8 ++++---- .../Double/DenseVectorTest.TextHandling.cs | 4 ++-- .../Double/Factorization/EvdTests.cs | 8 ++++---- .../Double/SparseVectorTest.TextHandling.cs | 4 ++-- .../Single/DenseVectorTest.TextHandling.cs | 4 ++-- .../Single/Factorization/EvdTests.cs | 8 ++++---- .../Single/SparseVectorTest.TextHandling.cs | 4 ++-- 12 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/UnitTests/AssertHelpers.cs b/src/UnitTests/AssertHelpers.cs index abb79129..6ef039c4 100644 --- a/src/UnitTests/AssertHelpers.cs +++ b/src/UnitTests/AssertHelpers.cs @@ -183,7 +183,7 @@ namespace MathNet.Numerics.UnitTests } - public static void ListAlmostEqual(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqual(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { @@ -194,7 +194,7 @@ namespace MathNet.Numerics.UnitTests } } - public static void ListAlmostEqual(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqual(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { @@ -205,7 +205,7 @@ namespace MathNet.Numerics.UnitTests } } - public static void ListAlmostEqual(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqual(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests } } - public static void ListAlmostEqual(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqual(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { @@ -227,7 +227,7 @@ namespace MathNet.Numerics.UnitTests } } - public static void ListAlmostEqualRelative(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqualRelative(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { @@ -238,7 +238,7 @@ namespace MathNet.Numerics.UnitTests } } - public static void ListAlmostEqualRelative(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqualRelative(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { @@ -249,7 +249,7 @@ namespace MathNet.Numerics.UnitTests } } - public static void ListAlmostEqualRelative(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqualRelative(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { @@ -260,7 +260,7 @@ namespace MathNet.Numerics.UnitTests } } - public static void ListAlmostEqualRelative(IList expected, IList actual, int decimalPlaces) + public static void AlmostEqualRelative(IList expected, IList actual, int decimalPlaces) { for (var i = 0; i < expected.Count; i++) { diff --git a/src/UnitTests/IntegralTransformsTests/HartleyTest.cs b/src/UnitTests/IntegralTransformsTests/HartleyTest.cs index 9b77d91e..81152a40 100644 --- a/src/UnitTests/IntegralTransformsTests/HartleyTest.cs +++ b/src/UnitTests/IntegralTransformsTests/HartleyTest.cs @@ -70,7 +70,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests dft(fourierComplex); var fourierReal = ArrayHelpers.ConvertAll(fourierComplex, s => s.Real); - AssertHelpers.ListAlmostEqual(fourierReal, hartleyReal, maximumErrorDecimalPlaces); + AssertHelpers.AlmostEqual(fourierReal, hartleyReal, maximumErrorDecimalPlaces); } /// diff --git a/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs b/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs index 3b0d6d0e..b014d4f0 100644 --- a/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs +++ b/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs @@ -69,7 +69,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests Assert.IsFalse(work.ListAlmostEqual(samples, 6)); work = Fourier.NaiveInverse(work, options); - AssertHelpers.ListAlmostEqual(samples, work, 12); + AssertHelpers.AlmostEqual(samples, work, 12); } /// @@ -88,7 +88,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests Assert.IsFalse(work.ListAlmostEqual(samples, 6)); Fourier.Radix2Inverse(work, options); - AssertHelpers.ListAlmostEqual(samples, work, 12); + AssertHelpers.AlmostEqual(samples, work, 12); } /// @@ -107,7 +107,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests Assert.IsFalse(work.ListAlmostEqual(samples, 6)); Fourier.BluesteinInverse(work, options); - AssertHelpers.ListAlmostEqual(samples, work, 10); + AssertHelpers.AlmostEqual(samples, work, 10); } /// @@ -126,7 +126,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests Assert.IsFalse(work.ListAlmostEqual(samples, 6)); work = Hartley.NaiveInverse(work, options); - AssertHelpers.ListAlmostEqual(samples, work, 12); + AssertHelpers.AlmostEqual(samples, work, 12); } /// @@ -143,13 +143,13 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests Assert.IsFalse(work.ListAlmostEqual(samples, 6)); Fourier.Inverse(work); - AssertHelpers.ListAlmostEqual(samples, work, 10); + AssertHelpers.AlmostEqual(samples, work, 10); Fourier.Inverse(work, FourierOptions.Default); Assert.IsFalse(work.ListAlmostEqual(samples, 6)); Fourier.Forward(work, FourierOptions.Default); - AssertHelpers.ListAlmostEqual(samples, work, 10); + AssertHelpers.AlmostEqual(samples, work, 10); } } } diff --git a/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs b/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs index a2d174b0..656c0b64 100644 --- a/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs +++ b/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs @@ -67,7 +67,7 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests samples.CopyTo(spectrumFast, 0); fast(spectrumFast, options); - AssertHelpers.ListAlmostEqual(spectrumNaive, spectrumFast, maximumErrorDecimalPlaces); + AssertHelpers.AlmostEqual(spectrumNaive, spectrumFast, maximumErrorDecimalPlaces); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs index 62028ed5..ccff616d 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs @@ -161,11 +161,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 9); + AssertHelpers.AlmostEqual(b, bReconstruct, 9); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } /// @@ -223,11 +223,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 9); + AssertHelpers.AlmostEqual(b, bReconstruct, 9); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs index e5a439a3..10a6d9c3 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs @@ -162,11 +162,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 2); + AssertHelpers.AlmostEqual(b, bReconstruct, 2); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } /// @@ -223,11 +223,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 2); + AssertHelpers.AlmostEqual(b, bReconstruct, 2); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTest.TextHandling.cs b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTest.TextHandling.cs index 0c46f6cb..49fdf747 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTest.TextHandling.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTest.TextHandling.cs @@ -121,11 +121,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double DenseVector vector; var ret = DenseVector.TryParse(text, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, (double[])vector, 14); + AssertHelpers.AlmostEqualRelative(data, (double[])vector, 14); ret = DenseVector.TryParse(text, CultureInfo.CurrentCulture, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, (double[])vector, 14); + AssertHelpers.AlmostEqualRelative(data, (double[])vector, 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs index 139161b4..42852f67 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs @@ -161,11 +161,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 9); + AssertHelpers.AlmostEqual(b, bReconstruct, 9); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } //private @@ -223,11 +223,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 9); + AssertHelpers.AlmostEqual(b, bReconstruct, 9); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.TextHandling.cs b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.TextHandling.cs index b63a82c4..f396f30b 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.TextHandling.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.TextHandling.cs @@ -120,11 +120,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double SparseVector vector; var ret = SparseVector.TryParse(text, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, vector.ToArray(), 14); + AssertHelpers.AlmostEqualRelative(data, vector.ToArray(), 14); ret = SparseVector.TryParse(text, CultureInfo.CurrentCulture, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, vector.ToArray(), 14); + AssertHelpers.AlmostEqualRelative(data, vector.ToArray(), 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTest.TextHandling.cs b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTest.TextHandling.cs index a3564548..13bdb974 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTest.TextHandling.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTest.TextHandling.cs @@ -121,11 +121,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single DenseVector vector; var ret = DenseVector.TryParse(text, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, (float[])vector, 14); + AssertHelpers.AlmostEqualRelative(data, (float[])vector, 14); ret = DenseVector.TryParse(text, CultureInfo.CurrentCulture, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, (float[])vector, 14); + AssertHelpers.AlmostEqualRelative(data, (float[])vector, 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs index ceec68c0..a56de79b 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs @@ -159,11 +159,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 0); + AssertHelpers.AlmostEqual(b, bReconstruct, 0); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } /// @@ -220,11 +220,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization var bReconstruct = A * x; // Check the reconstruction. - AssertHelpers.ListAlmostEqual(b, bReconstruct, 0); + AssertHelpers.AlmostEqual(b, bReconstruct, 0); // Make sure A/B didn't change. AssertHelpers.AlmostEqual(ACopy, A, 14); - AssertHelpers.ListAlmostEqual(bCopy, b, 14); + AssertHelpers.AlmostEqual(bCopy, b, 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.TextHandling.cs b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.TextHandling.cs index 8ae0c3cb..603846d0 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.TextHandling.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.TextHandling.cs @@ -120,11 +120,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single SparseVector vector; var ret = SparseVector.TryParse(text, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, vector.ToArray(), 14); + AssertHelpers.AlmostEqualRelative(data, vector.ToArray(), 14); ret = SparseVector.TryParse(text, CultureInfo.CurrentCulture, out vector); Assert.IsTrue(ret); - AssertHelpers.ListAlmostEqualRelative(data, vector.ToArray(), 14); + AssertHelpers.AlmostEqualRelative(data, vector.ToArray(), 14); } ///