From 9e2b83551c8f6d04040a9a39d59d6eaf639272cc Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sun, 20 Oct 2013 14:41:50 +0200 Subject: [PATCH] LA: Iterative solvers: make failure stop criterium generic/shared --- src/Numerics/LinearAlgebra/Builder.cs | 8 +- .../Complex/Solvers/FailureStopCriterium.cs | 138 ------------------ .../Complex32/Solvers/FailureStopCriterium.cs | 133 ----------------- .../Double/Solvers/FailureStopCriterium.cs | 131 ----------------- .../Solvers/FailureStopCriterium.cs | 25 ++-- src/Numerics/Numerics.csproj | 5 +- .../Complex/Solvers/Iterative/BiCgStabTest.cs | 6 +- .../Complex/Solvers/Iterative/GpBiCgTest.cs | 6 +- .../Solvers/Iterative/MlkBiCgStabTest.cs | 6 +- .../Complex/Solvers/Iterative/TFQMRTest.cs | 6 +- .../Complex/Solvers/IteratorTest.cs | 7 +- .../StopCriterium/FailureStopCriteriumTest.cs | 19 ++- .../Solvers/Iterative/BiCgStabTest.cs | 6 +- .../Complex32/Solvers/Iterative/GpBiCgTest.cs | 6 +- .../Solvers/Iterative/MlkBiCgStabTest.cs | 6 +- .../Complex32/Solvers/Iterative/TFQMRTest.cs | 6 +- .../Complex32/Solvers/IteratorTest.cs | 7 +- .../StopCriterium/FailureStopCriteriumTest.cs | 19 ++- .../Double/Solvers/Iterative/BiCgStabTest.cs | 6 +- .../Double/Solvers/Iterative/GpBiCgTest.cs | 6 +- .../Solvers/Iterative/MlkBiCgStabTest.cs | 6 +- .../Double/Solvers/Iterative/TFQMRTest.cs | 6 +- .../Double/Solvers/IteratorTest.cs | 7 +- .../StopCriterium/FailureStopCriteriumTest.cs | 19 ++- .../Single/Solvers/Iterative/BiCgStabTest.cs | 6 +- .../Single/Solvers/Iterative/GpBiCgTest.cs | 6 +- .../Solvers/Iterative/MlkBiCgStabTest.cs | 6 +- .../Single/Solvers/Iterative/TFQMRTest.cs | 6 +- .../Single/Solvers/IteratorTest.cs | 7 +- .../StopCriterium/FailureStopCriteriumTest.cs | 19 ++- 30 files changed, 110 insertions(+), 530 deletions(-) delete mode 100644 src/Numerics/LinearAlgebra/Complex/Solvers/FailureStopCriterium.cs delete mode 100644 src/Numerics/LinearAlgebra/Complex32/Solvers/FailureStopCriterium.cs delete mode 100644 src/Numerics/LinearAlgebra/Double/Solvers/FailureStopCriterium.cs rename src/Numerics/LinearAlgebra/{Single => }/Solvers/FailureStopCriterium.cs (84%) diff --git a/src/Numerics/LinearAlgebra/Builder.cs b/src/Numerics/LinearAlgebra/Builder.cs index ce59524f..0a8907e0 100644 --- a/src/Numerics/LinearAlgebra/Builder.cs +++ b/src/Numerics/LinearAlgebra/Builder.cs @@ -77,7 +77,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double { return new IIterationStopCriterium[] { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(maxIterations), new ResidualStopCriterium(1e-12) @@ -154,7 +154,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single { return new IIterationStopCriterium[] { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(maxIterations), new ResidualStopCriterium(1e-6) @@ -237,7 +237,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex { return new IIterationStopCriterium[] { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(maxIterations), new ResidualStopCriterium(1e-12) @@ -314,7 +314,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 { return new IIterationStopCriterium[] { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(maxIterations), new ResidualStopCriterium(1e-6) diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/FailureStopCriterium.cs deleted file mode 100644 index 81deed2c..00000000 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/FailureStopCriterium.cs +++ /dev/null @@ -1,138 +0,0 @@ -// -// Math.NET Numerics, part of the Math.NET Project -// http://numerics.mathdotnet.com -// http://github.com/mathnet/mathnet-numerics -// http://mathnetnumerics.codeplex.com -// -// Copyright (c) 2009-2010 Math.NET -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Diagnostics; -using MathNet.Numerics.LinearAlgebra.Solvers; -using MathNet.Numerics.Properties; - -namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers -{ - -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; -#endif - - /// - /// Defines an that monitors residuals for NaN's. - /// - public sealed class FailureStopCriterium : IIterationStopCriterium - { - /// - /// Defines the default last iteration number. Set to -1 because iterations normally - /// start at 0. - /// - const int DefaultLastIterationNumber = -1; - - /// - /// The status of the calculation - /// - IterationStatus _status = IterationStatus.Continue; - - /// - /// The iteration number of the last iteration. - /// - int _lastIteration = DefaultLastIterationNumber; - - /// - /// Determines the status of the iterative calculation based on the stop criteria stored - /// by the current . Result is set into Status field. - /// - /// The number of iterations that have passed so far. - /// The vector containing the current solution values. - /// The right hand side vector. - /// The vector containing the current residual vectors. - /// - /// The individual stop criteria may internally track the progress of the calculation based - /// on the invocation of this method. Therefore this method should only be called if the - /// calculation has moved forwards at least one step. - /// - public IterationStatus DetermineStatus(int iterationNumber, Vector solutionVector, Vector sourceVector, Vector residualVector) - { - if (iterationNumber < 0) - { - throw new ArgumentOutOfRangeException("iterationNumber"); - } - - if (solutionVector.Count != residualVector.Count) - { - throw new ArgumentException(Resources.ArgumentArraysSameLength); - } - - if (_lastIteration >= iterationNumber) - { - // We have already stored the actual last iteration number - // For now do nothing. We only care about the next step. - return _status; - } - - // Store the infinity norms of both the solution and residual vectors - double residualNorm = residualVector.InfinityNorm(); - double solutionNorm = solutionVector.InfinityNorm(); - - _status = double.IsNaN(solutionNorm) || double.IsNaN(residualNorm) ? IterationStatus.Failure : IterationStatus.Continue; - - _lastIteration = iterationNumber; - return _status; - } - - /// - /// Gets the current calculation status. - /// - public IterationStatus Status - { - [DebuggerStepThrough] - get - { - return _status; - } - } - - /// - /// Resets the to the pre-calculation state. - /// - public void Reset() - { - _status = IterationStatus.Continue; - _lastIteration = DefaultLastIterationNumber; - } - - /// - /// Clones the current and its settings. - /// - /// A new instance of the class. - public IIterationStopCriterium Clone() - { - return new FailureStopCriterium(); - } - } -} diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/FailureStopCriterium.cs deleted file mode 100644 index d2fbc925..00000000 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/FailureStopCriterium.cs +++ /dev/null @@ -1,133 +0,0 @@ -// -// Math.NET Numerics, part of the Math.NET Project -// http://numerics.mathdotnet.com -// http://github.com/mathnet/mathnet-numerics -// http://mathnetnumerics.codeplex.com -// -// Copyright (c) 2009-2010 Math.NET -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Diagnostics; -using MathNet.Numerics.LinearAlgebra.Solvers; -using MathNet.Numerics.Properties; - -namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers -{ - using Numerics; - - /// - /// Defines an that monitors residuals for NaN's. - /// - public sealed class FailureStopCriterium : IIterationStopCriterium - { - /// - /// Defines the default last iteration number. Set to -1 because iterations normally - /// start at 0. - /// - const int DefaultLastIterationNumber = -1; - - /// - /// The status of the calculation - /// - IterationStatus _status = IterationStatus.Continue; - - /// - /// The iteration number of the last iteration. - /// - int _lastIteration = DefaultLastIterationNumber; - - /// - /// Determines the status of the iterative calculation based on the stop criteria stored - /// by the current . Result is set into Status field. - /// - /// The number of iterations that have passed so far. - /// The vector containing the current solution values. - /// The right hand side vector. - /// The vector containing the current residual vectors. - /// - /// The individual stop criteria may internally track the progress of the calculation based - /// on the invocation of this method. Therefore this method should only be called if the - /// calculation has moved forwards at least one step. - /// - public IterationStatus DetermineStatus(int iterationNumber, Vector solutionVector, Vector sourceVector, Vector residualVector) - { - if (iterationNumber < 0) - { - throw new ArgumentOutOfRangeException("iterationNumber"); - } - - if (solutionVector.Count != residualVector.Count) - { - throw new ArgumentException(Resources.ArgumentArraysSameLength); - } - - if (_lastIteration >= iterationNumber) - { - // We have already stored the actual last iteration number - // For now do nothing. We only care about the next step. - return _status; - } - - // Store the infinity norms of both the solution and residual vectors - double residualNorm = residualVector.InfinityNorm(); - double solutionNorm = solutionVector.InfinityNorm(); - - _status = double.IsNaN(solutionNorm) || double.IsNaN(residualNorm) ? IterationStatus.Failure : IterationStatus.Continue; - - _lastIteration = iterationNumber; - return _status; - } - - /// - /// Gets the current calculation status. - /// - public IterationStatus Status - { - [DebuggerStepThrough] - get - { - return _status; - } - } - - /// - /// Resets the to the pre-calculation state. - /// - public void Reset() - { - _status = IterationStatus.Continue; - _lastIteration = DefaultLastIterationNumber; - } - - /// - /// Clones the current and its settings. - /// - /// A new instance of the class. - public IIterationStopCriterium Clone() - { - return new FailureStopCriterium(); - } - } -} diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/FailureStopCriterium.cs deleted file mode 100644 index 4876aa9a..00000000 --- a/src/Numerics/LinearAlgebra/Double/Solvers/FailureStopCriterium.cs +++ /dev/null @@ -1,131 +0,0 @@ -// -// Math.NET Numerics, part of the Math.NET Project -// http://numerics.mathdotnet.com -// http://github.com/mathnet/mathnet-numerics -// http://mathnetnumerics.codeplex.com -// -// Copyright (c) 2009-2010 Math.NET -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// - -using System; -using System.Diagnostics; -using MathNet.Numerics.LinearAlgebra.Solvers; -using MathNet.Numerics.Properties; - -namespace MathNet.Numerics.LinearAlgebra.Double.Solvers -{ - /// - /// Defines an that monitors residuals for NaN's. - /// - public sealed class FailureStopCriterium : IIterationStopCriterium - { - /// - /// Defines the default last iteration number. Set to -1 because iterations normally - /// start at 0. - /// - const int DefaultLastIterationNumber = -1; - - /// - /// The status of the calculation - /// - IterationStatus _status = IterationStatus.Continue; - - /// - /// The iteration number of the last iteration. - /// - int _lastIteration = DefaultLastIterationNumber; - - /// - /// Determines the status of the iterative calculation based on the stop criteria stored - /// by the current . Result is set into Status field. - /// - /// The number of iterations that have passed so far. - /// The vector containing the current solution values. - /// The right hand side vector. - /// The vector containing the current residual vectors. - /// - /// The individual stop criteria may internally track the progress of the calculation based - /// on the invocation of this method. Therefore this method should only be called if the - /// calculation has moved forwards at least one step. - /// - public IterationStatus DetermineStatus(int iterationNumber, Vector solutionVector, Vector sourceVector, Vector residualVector) - { - if (iterationNumber < 0) - { - throw new ArgumentOutOfRangeException("iterationNumber"); - } - - if (solutionVector.Count != residualVector.Count) - { - throw new ArgumentException(Resources.ArgumentArraysSameLength); - } - - if (_lastIteration >= iterationNumber) - { - // We have already stored the actual last iteration number - // For now do nothing. We only care about the next step. - return _status; - } - - // Store the infinity norms of both the solution and residual vectors - double residualNorm = residualVector.InfinityNorm(); - double solutionNorm = solutionVector.InfinityNorm(); - - _status = double.IsNaN(solutionNorm) || double.IsNaN(residualNorm) ? IterationStatus.Failure : IterationStatus.Continue; - - _lastIteration = iterationNumber; - return _status; - } - - /// - /// Gets the current calculation status. - /// - public IterationStatus Status - { - [DebuggerStepThrough] - get - { - return _status; - } - } - - /// - /// Resets the to the pre-calculation state. - /// - public void Reset() - { - _status = IterationStatus.Continue; - _lastIteration = DefaultLastIterationNumber; - } - - /// - /// Clones the current and its settings. - /// - /// A new instance of the class. - public IIterationStopCriterium Clone() - { - return new FailureStopCriterium(); - } - } -} diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Solvers/FailureStopCriterium.cs similarity index 84% rename from src/Numerics/LinearAlgebra/Single/Solvers/FailureStopCriterium.cs rename to src/Numerics/LinearAlgebra/Solvers/FailureStopCriterium.cs index 4d25ac57..1f2e0e97 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/FailureStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Solvers/FailureStopCriterium.cs @@ -30,22 +30,15 @@ using System; using System.Diagnostics; -using MathNet.Numerics.LinearAlgebra.Solvers; using MathNet.Numerics.Properties; -namespace MathNet.Numerics.LinearAlgebra.Single.Solvers +namespace MathNet.Numerics.LinearAlgebra.Solvers { /// /// Defines an that monitors residuals for NaN's. /// - public sealed class FailureStopCriterium : IIterationStopCriterium + public sealed class FailureStopCriterium : IIterationStopCriterium where T : struct, IEquatable, IFormattable { - /// - /// Defines the default last iteration number. Set to -1 because iterations normally - /// start at 0. - /// - const int DefaultLastIterationNumber = -1; - /// /// The status of the calculation /// @@ -54,7 +47,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers /// /// The iteration number of the last iteration. /// - int _lastIteration = DefaultLastIterationNumber; + int _lastIteration = -1; /// /// Determines the status of the iterative calculation based on the stop criteria stored @@ -69,7 +62,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers /// on the invocation of this method. Therefore this method should only be called if the /// calculation has moved forwards at least one step. /// - public IterationStatus DetermineStatus(int iterationNumber, Vector solutionVector, Vector sourceVector, Vector residualVector) + public IterationStatus DetermineStatus(int iterationNumber, Vector solutionVector, Vector sourceVector, Vector residualVector) { if (iterationNumber < 0) { @@ -116,16 +109,16 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers public void Reset() { _status = IterationStatus.Continue; - _lastIteration = DefaultLastIterationNumber; + _lastIteration = -1; } /// - /// Clones the current and its settings. + /// Clones the current and its settings. /// - /// A new instance of the class. - public IIterationStopCriterium Clone() + /// A new instance of the class. + public IIterationStopCriterium Clone() { - return new FailureStopCriterium(); + return new FailureStopCriterium(); } } } diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index af2419d3..58b7398b 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -255,7 +255,6 @@ - @@ -277,7 +276,6 @@ - @@ -316,7 +314,7 @@ - + @@ -342,7 +340,6 @@ - diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs index 45d0b1d8..b54df88e 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs @@ -101,7 +101,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -144,7 +144,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ var monitor = new Iterator(new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -220,7 +220,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ var monitor = new Iterator(new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs index 8f0a1bde..0aefbe3a 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs @@ -101,7 +101,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -145,7 +145,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -222,7 +222,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs index 7d82fd8c..3d017114 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs @@ -101,7 +101,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -145,7 +145,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -222,7 +222,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs index 1d2ac7f4..13e0e59f 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs @@ -101,7 +101,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -145,7 +145,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -222,7 +222,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterativ new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs index 2327535c..0821ae51 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs @@ -31,7 +31,6 @@ using System; using System.Collections.Generic; using MathNet.Numerics.LinearAlgebra.Complex; -using MathNet.Numerics.LinearAlgebra.Complex.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -71,7 +70,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(), new ResidualStopCriterium(1e-12) @@ -93,7 +92,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; @@ -125,7 +124,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs index fb76c96b..59883944 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -30,7 +30,6 @@ using System; using MathNet.Numerics.LinearAlgebra.Complex; -using MathNet.Numerics.LinearAlgebra.Complex.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -54,7 +53,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void Create() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "Should have a criterium now"); } @@ -64,7 +63,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void DetermineStatusWithIllegalIterationNumberThrowsArgumentOutOfRangeException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(-1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 5), DenseVector.Create(3, i => 6))); @@ -76,7 +75,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void DetermineStatusWithNonMatchingVectorsThrowsArgumentException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 6), DenseVector.Create(4, i => 4))); @@ -88,7 +87,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void DetermineStatusWithResidualNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex(1.0, 0), new Complex(1.0, 0), new Complex(2.0, 0)}); @@ -105,7 +104,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void DetermineStatusWithSolutionNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex(1.0, 0), new Complex(1.0, 0), new Complex(double.NaN, 0)}); @@ -122,7 +121,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void DetermineStatus() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex(3.0, 0), new Complex(2.0, 0), new Complex(1, 0)}); @@ -139,7 +138,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void ResetCalculationState() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex(1.0, 0), new Complex(1.0, 0), new Complex(2, 0)}); @@ -159,10 +158,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCrit [Test] public void Clone() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var clone = criterium.Clone(); - Assert.IsInstanceOf(typeof (FailureStopCriterium), clone, "Wrong criterium type"); + Assert.IsInstanceOf(typeof(FailureStopCriterium), clone, "Wrong criterium type"); } } } diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs index d2680073..88e95373 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs @@ -97,7 +97,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -141,7 +141,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -218,7 +218,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs index bbb25f82..333eadaf 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs @@ -97,7 +97,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -141,7 +141,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -218,7 +218,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs index 5ecd64d9..7aec9c43 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs @@ -97,7 +97,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -141,7 +141,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -218,7 +218,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs index ab17064a..be3cef67 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs @@ -97,7 +97,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -141,7 +141,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -218,7 +218,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterat new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs index 41558e20..54d75dd8 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs @@ -31,7 +31,6 @@ using System; using System.Collections.Generic; using MathNet.Numerics.LinearAlgebra.Complex32; -using MathNet.Numerics.LinearAlgebra.Complex32.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -67,7 +66,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(), new ResidualStopCriterium(1e-6) @@ -89,7 +88,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; @@ -121,7 +120,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs index f68d8fa5..2bb1512f 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -30,7 +30,6 @@ using System; using MathNet.Numerics.LinearAlgebra.Complex32; -using MathNet.Numerics.LinearAlgebra.Complex32.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -50,7 +49,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void Create() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "Should have a criterium now"); } @@ -60,7 +59,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void DetermineStatusWithIllegalIterationNumberThrowsArgumentOutOfRangeException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(-1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 5), DenseVector.Create(3, i => 6))); @@ -72,7 +71,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void DetermineStatusWithNonMatchingVectorsThrowsArgumentException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 6), DenseVector.Create(4, i => 4))); @@ -84,7 +83,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void DetermineStatusWithResidualNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex32(1.0f, 0), new Complex32(1.0f, 0), new Complex32(2.0f, 0)}); @@ -101,7 +100,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void DetermineStatusWithSolutionNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex32(1.0f, 0), new Complex32(1.0f, 0), new Complex32(float.NaN, 0)}); @@ -118,7 +117,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void DetermineStatus() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex32(3.0f, 0), new Complex32(2.0f, 0), new Complex32(1, 0)}); @@ -135,7 +134,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void ResetCalculationState() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {new Complex32(1.0f, 0), new Complex32(1.0f, 0), new Complex32(2, 0)}); @@ -155,11 +154,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCr [Test] public void Clone() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var clone = criterium.Clone(); - Assert.IsInstanceOf(typeof (FailureStopCriterium), clone, "Wrong criterium type"); + Assert.IsInstanceOf(typeof(FailureStopCriterium), clone, "Wrong criterium type"); } } } diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs index 26083717..0475dd63 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs @@ -95,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs index 47ff7ef3..5cfd718c 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs @@ -95,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs index c6a9b131..2e454009 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs @@ -95,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs index 6483a53c..c551df08 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs @@ -95,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs index b5957016..4237f32e 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs @@ -31,7 +31,6 @@ using System; using System.Collections.Generic; using MathNet.Numerics.LinearAlgebra.Double; -using MathNet.Numerics.LinearAlgebra.Double.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -65,7 +64,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(), new ResidualStopCriterium(1e-12) @@ -87,7 +86,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; @@ -119,7 +118,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs index a2c49cf1..4fbf30e9 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -30,7 +30,6 @@ using System; using MathNet.Numerics.LinearAlgebra.Double; -using MathNet.Numerics.LinearAlgebra.Double.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -48,7 +47,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void Create() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "Should have a criterium now"); } @@ -58,7 +57,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void DetermineStatusWithIllegalIterationNumberThrowsArgumentOutOfRangeException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(-1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 5), DenseVector.Create(3, i => 6))); @@ -70,7 +69,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void DetermineStatusWithNonMatchingVectorsThrowsArgumentException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 6), DenseVector.Create(4, i => 4))); @@ -82,7 +81,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void DetermineStatusWithResidualNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {1.0, 1.0, 2.0}); @@ -99,7 +98,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void DetermineStatusWithSolutionNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {1.0, 1.0, double.NaN}); @@ -116,7 +115,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void DetermineStatus() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {3.0, 2.0, 1.0}); @@ -133,7 +132,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void ResetCalculationState() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {1.0, 1.0, 2.0}); @@ -153,10 +152,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCrite [Test] public void Clone() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var clone = criterium.Clone(); - Assert.IsInstanceOf(typeof (FailureStopCriterium), clone, "Wrong criterium type"); + Assert.IsInstanceOf(typeof(FailureStopCriterium), clone, "Wrong criterium type"); } } } diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs index 01da26e6..0682bee5 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs @@ -95,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new BiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs index 21761734..a7f010a2 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs @@ -95,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new GpBiCg(); diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs index 20862fe7..6fcf9957 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs @@ -96,7 +96,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -140,7 +140,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); @@ -221,7 +221,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new MlkBiCgStab(); diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs index b7c7010c..4ab698ab 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs @@ -95,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -139,7 +139,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); @@ -216,7 +216,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative new IterationCountStopCriterium(MaximumIterations), new ResidualStopCriterium(ConvergenceBoundary), new DivergenceStopCriterium(), - new FailureStopCriterium()); + new FailureStopCriterium()); var solver = new TFQMR(); diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs index 4261b242..e6042def 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs @@ -31,7 +31,6 @@ using System; using System.Collections.Generic; using MathNet.Numerics.LinearAlgebra.Single; -using MathNet.Numerics.LinearAlgebra.Single.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -65,7 +64,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(), new ResidualStopCriterium(1e-6) @@ -87,7 +86,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; @@ -119,7 +118,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers { var criteria = new List> { - new FailureStopCriterium(), + new FailureStopCriterium(), new DivergenceStopCriterium(), new IterationCountStopCriterium(1) }; diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs index a6d03da0..20722e4a 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -30,7 +30,6 @@ using System; using MathNet.Numerics.LinearAlgebra.Single; -using MathNet.Numerics.LinearAlgebra.Single.Solvers; using MathNet.Numerics.LinearAlgebra.Solvers; using NUnit.Framework; @@ -48,7 +47,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void Create() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "Should have a criterium now"); } @@ -58,7 +57,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void DetermineStatusWithIllegalIterationNumberThrowsArgumentOutOfRangeException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(-1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 5), DenseVector.Create(3, i => 6))); @@ -70,7 +69,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void DetermineStatusWithNonMatchingVectorsThrowsArgumentException() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); Assert.Throws(() => criterium.DetermineStatus(1, DenseVector.Create(3, i => 4), DenseVector.Create(3, i => 6), DenseVector.Create(4, i => 4))); @@ -82,7 +81,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void DetermineStatusWithResidualNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {1.0f, 1.0f, 2.0f}); @@ -99,7 +98,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void DetermineStatusWithSolutionNaN() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {1, 1, float.NaN}); @@ -116,7 +115,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void DetermineStatus() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {3.0f, 2.0f, 1.0f}); @@ -133,7 +132,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void ResetCalculationState() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var solution = new DenseVector(new[] {1.0f, 1.0f, 2.0f}); @@ -153,11 +152,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCrite [Test] public void Clone() { - var criterium = new FailureStopCriterium(); + var criterium = new FailureStopCriterium(); Assert.IsNotNull(criterium, "There should be a criterium"); var clone = criterium.Clone(); - Assert.IsInstanceOf(typeof (FailureStopCriterium), clone, "Wrong criterium type"); + Assert.IsInstanceOf(typeof(FailureStopCriterium), clone, "Wrong criterium type"); } } }