diff --git a/src/Numerics/LinearAlgebra/Solvers/Iterator.cs b/src/Numerics/LinearAlgebra/Solvers/Iterator.cs
index a9adcfdc..470254bc 100644
--- a/src/Numerics/LinearAlgebra/Solvers/Iterator.cs
+++ b/src/Numerics/LinearAlgebra/Solvers/Iterator.cs
@@ -83,22 +83,6 @@ namespace MathNet.Numerics.LinearAlgebra.Solvers
get { return _status; }
}
- ///
- /// True if the calculation has converged to the desired convergence levels.
- ///
- public bool HasConverged
- {
- get { return _status == IterationStatus.Converged; }
- }
-
- ///
- /// True if the calculation has been stopped due to reaching the stopping limits but that convergence was not achieved.
- ///
- public bool HasStoppedWithoutConvergence
- {
- get { return _status == IterationStatus.StoppedWithoutConvergence; }
- }
-
///
/// Determines the status of the iterative calculation based on the stop criteria stored
/// by the current . Result is set into Status field.
diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs
index 2e6c31f5..240ce66f 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs
index 9b35de71..48f2e0ff 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs
index fe4ddb44..dfb7eff3 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs
index 59f8594f..a0e8682d 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs
index 7e4e9d89..3c35e76b 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs
+++ b/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;
diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs
index 763c7fff..95134a7f 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs
+++ b/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;
diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs
index f35930fc..033237a7 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs
+++ b/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;
diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs
index 4316a337..c2fa4c47 100644
--- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs
+++ b/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;
diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs
index 629dc77c..f25d97f7 100644
--- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs
index 757077d7..b8e72673 100644
--- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs
index 6461b4af..ebc95618 100644
--- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs
index 430f958f..0606e466 100644
--- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs
+++ b/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++)
diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs
index db7ba283..3c924e17 100644
--- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs
+++ b/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;
diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs
index b38c926e..2f26796d 100644
--- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs
+++ b/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;
diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs
index 5691c91c..b5734135 100644
--- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs
+++ b/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;
diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs
index bca6ab49..25f8c054 100644
--- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs
+++ b/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;