Browse Source

LA: Undo introduction of iterator HasX helpers

optimization-1
Christoph Ruegg 13 years ago
parent
commit
b38ce946e5
  1. 16
      src/Numerics/LinearAlgebra/Solvers/Iterator.cs
  2. 6
      src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs
  3. 6
      src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs
  4. 6
      src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs
  5. 6
      src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs
  6. 10
      src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs
  7. 8
      src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs
  8. 10
      src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs
  9. 10
      src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs
  10. 6
      src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs
  11. 6
      src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs
  12. 6
      src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs
  13. 6
      src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs
  14. 10
      src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs
  15. 10
      src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs
  16. 10
      src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs
  17. 10
      src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs

16
src/Numerics/LinearAlgebra/Solvers/Iterator.cs

@ -83,22 +83,6 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers
get { return _status; }
}
/// <summary>
/// True if the calculation has converged to the desired convergence levels.
/// </summary>
public bool HasConverged
{
get { return _status == IterationStatus.Converged; }
}
/// <summary>
/// True if the calculation has been stopped due to reaching the stopping limits but that convergence was not achieved.
/// </summary>
public bool HasStoppedWithoutConvergence
{
get { return _status == IterationStatus.StoppedWithoutConvergence; }
}
/// <summary>
/// Determines the status of the iterative calculation based on the stop criteria stored
/// by the current <see cref="Iterator{T}"/>. Result is set into <c>Status</c> field.

6
src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs

@ -114,7 +114,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -159,7 +159,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -237,7 +237,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

6
src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs

@ -114,7 +114,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -160,7 +160,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -239,7 +239,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

6
src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs

@ -115,7 +115,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -160,7 +160,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -238,7 +238,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

6
src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs

@ -115,7 +115,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -160,7 +160,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -238,7 +238,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

10
src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs

@ -114,7 +114,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -159,7 +159,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -237,7 +237,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -271,7 +271,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;
@ -313,7 +313,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var solver = new BiCgStab();
var matrixX = solver.Solve(matrixA, matrixB, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

8
src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs

@ -114,7 +114,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -160,7 +160,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -239,7 +239,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -269,7 +269,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

10
src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs

@ -115,7 +115,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -160,7 +160,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -238,7 +238,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -268,7 +268,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;
@ -310,7 +310,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var solver = new MlkBiCgStab();
var matrixX = solver.Solve(matrixA, matrixB, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

10
src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs

@ -115,7 +115,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -160,7 +160,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -238,7 +238,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -268,7 +268,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;
@ -310,7 +310,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat
var solver = new TFQMR();
var matrixX = solver.Solve(matrixA, matrixB, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

6
src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs

@ -112,7 +112,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -157,7 +157,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -235,7 +235,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

6
src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs

@ -112,7 +112,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -158,7 +158,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -237,7 +237,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

6
src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs

@ -113,7 +113,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -158,7 +158,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -236,7 +236,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

6
src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs

@ -113,7 +113,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -158,7 +158,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -236,7 +236,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)

10
src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs

@ -112,7 +112,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -157,7 +157,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -235,7 +235,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -266,7 +266,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new BiCgStab();
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;
@ -307,7 +307,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new BiCgStab();
var matrixX = solver.Solve(matrixA, matrixB, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

10
src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs

@ -112,7 +112,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -158,7 +158,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -237,7 +237,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -268,7 +268,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new GpBiCg();
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;
@ -309,7 +309,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new GpBiCg();
var matrixX = solver.Solve(matrixA, matrixB, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

10
src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs

@ -114,7 +114,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -159,7 +159,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -241,7 +241,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
continue;
}
if (!(monitor.HasConverged))
if (!(monitor.Status == IterationStatus.Converged))
{
continue;
}
@ -285,7 +285,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new MlkBiCgStab();
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;
@ -328,7 +328,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new MlkBiCgStab();
var matrixX = solver.Solve(matrixA, matrixB, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

10
src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs

@ -113,7 +113,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -158,7 +158,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -236,7 +236,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var z = matrix.Multiply(x);
// Check that the solution converged
Assert.IsTrue(monitor.HasConverged, "#04");
Assert.IsTrue(monitor.Status == IterationStatus.Converged, "#04");
// Now compare the vectors
for (var i = 0; i < y.Count; i++)
@ -267,7 +267,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new TFQMR();
var resultx = solver.Solve(matrixA, vectorb, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;
@ -308,7 +308,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative
var solver = new TFQMR();
var matrixX = solver.Solve(matrixA, matrixB, monitor);
if (!monitor.HasConverged)
if (!(monitor.Status == IterationStatus.Converged))
{
// Solution was not found, try again downgrading convergence boundary
continue;

Loading…
Cancel
Save