Browse Source

Tests: more consistent naming in AssertHelpers

provider
Christoph Ruegg 13 years ago
parent
commit
3992a32123
  1. 16
      src/UnitTests/AssertHelpers.cs
  2. 2
      src/UnitTests/IntegralTransformsTests/HartleyTest.cs
  3. 12
      src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs
  4. 2
      src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs
  5. 8
      src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs
  6. 8
      src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs
  7. 4
      src/UnitTests/LinearAlgebraTests/Double/DenseVectorTest.TextHandling.cs
  8. 8
      src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs
  9. 4
      src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.TextHandling.cs
  10. 4
      src/UnitTests/LinearAlgebraTests/Single/DenseVectorTest.TextHandling.cs
  11. 8
      src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs
  12. 4
      src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.TextHandling.cs

16
src/UnitTests/AssertHelpers.cs

@ -183,7 +183,7 @@ namespace MathNet.Numerics.UnitTests
}
public static void ListAlmostEqual(IList<double> expected, IList<double> actual, int decimalPlaces)
public static void AlmostEqual(IList<double> expected, IList<double> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{
@ -194,7 +194,7 @@ namespace MathNet.Numerics.UnitTests
}
}
public static void ListAlmostEqual(IList<float> expected, IList<float> actual, int decimalPlaces)
public static void AlmostEqual(IList<float> expected, IList<float> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{
@ -205,7 +205,7 @@ namespace MathNet.Numerics.UnitTests
}
}
public static void ListAlmostEqual(IList<Complex> expected, IList<Complex> actual, int decimalPlaces)
public static void AlmostEqual(IList<Complex> expected, IList<Complex> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{
@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests
}
}
public static void ListAlmostEqual(IList<Complex32> expected, IList<Complex32> actual, int decimalPlaces)
public static void AlmostEqual(IList<Complex32> expected, IList<Complex32> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{
@ -227,7 +227,7 @@ namespace MathNet.Numerics.UnitTests
}
}
public static void ListAlmostEqualRelative(IList<double> expected, IList<double> actual, int decimalPlaces)
public static void AlmostEqualRelative(IList<double> expected, IList<double> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{
@ -238,7 +238,7 @@ namespace MathNet.Numerics.UnitTests
}
}
public static void ListAlmostEqualRelative(IList<float> expected, IList<float> actual, int decimalPlaces)
public static void AlmostEqualRelative(IList<float> expected, IList<float> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{
@ -249,7 +249,7 @@ namespace MathNet.Numerics.UnitTests
}
}
public static void ListAlmostEqualRelative(IList<Complex> expected, IList<Complex> actual, int decimalPlaces)
public static void AlmostEqualRelative(IList<Complex> expected, IList<Complex> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{
@ -260,7 +260,7 @@ namespace MathNet.Numerics.UnitTests
}
}
public static void ListAlmostEqualRelative(IList<Complex32> expected, IList<Complex32> actual, int decimalPlaces)
public static void AlmostEqualRelative(IList<Complex32> expected, IList<Complex32> actual, int decimalPlaces)
{
for (var i = 0; i < expected.Count; i++)
{

2
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);
}
/// <summary>

12
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);
}
/// <summary>
@ -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);
}
/// <summary>
@ -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);
}
/// <summary>
@ -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);
}
/// <summary>
@ -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);
}
}
}

2
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);
}
/// <summary>

8
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);
}
/// <summary>
@ -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);
}
/// <summary>

8
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);
}
/// <summary>
@ -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);
}
/// <summary>

4
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);
}
/// <summary>

8
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);
}
/// <summary>

4
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);
}
/// <summary>

4
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);
}
/// <summary>

8
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);
}
/// <summary>
@ -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);
}
/// <summary>

4
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);
}
/// <summary>

Loading…
Cancel
Save