diff --git a/src/FSharp/Fit.fs b/src/FSharp/Fit.fs index 28f3f239..4a15502c 100644 --- a/src/FSharp/Fit.fs +++ b/src/FSharp/Fit.fs @@ -32,7 +32,7 @@ namespace MathNet.Numerics open System open MathNet.Numerics.LinearAlgebra.Double -open MathNet.Numerics.LinearAlgebra.Generic.Factorization +open MathNet.Numerics.LinearAlgebra.Factorization [] module Fit = diff --git a/src/FSharp/LinearAlgebra.Double.Matrix.fs b/src/FSharp/LinearAlgebra.Double.Matrix.fs index 5ff75f6a..b9761a90 100644 --- a/src/FSharp/LinearAlgebra.Double.Matrix.fs +++ b/src/FSharp/LinearAlgebra.Double.Matrix.fs @@ -30,7 +30,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra /// A module which implements functional matrix operations. [] diff --git a/src/FSharp/LinearAlgebra.Double.Vector.fs b/src/FSharp/LinearAlgebra.Double.Vector.fs index 61624295..80552062 100644 --- a/src/FSharp/LinearAlgebra.Double.Vector.fs +++ b/src/FSharp/LinearAlgebra.Double.Vector.fs @@ -30,7 +30,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra /// A module which implements functional vector operations. [] diff --git a/src/FSharp/LinearAlgebra.Double.fs b/src/FSharp/LinearAlgebra.Double.fs index 7c734e24..77dd36cd 100644 --- a/src/FSharp/LinearAlgebra.Double.fs +++ b/src/FSharp/LinearAlgebra.Double.fs @@ -30,7 +30,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra /// A module which implements some F# utility functions. [] @@ -40,4 +40,4 @@ module Utility = let inline matrix (lst: list>) = DenseMatrix.ofList lst :> Matrix /// Construct a dense vector from a list of floating point numbers. - let inline vector (lst: list) = DenseVector.ofList lst :> Vector \ No newline at end of file + let inline vector (lst: list) = DenseVector.ofList lst :> Vector diff --git a/src/FSharp/LinearAlgebra.fs b/src/FSharp/LinearAlgebra.fs index 18fcd581..e348f464 100644 --- a/src/FSharp/LinearAlgebra.fs +++ b/src/FSharp/LinearAlgebra.fs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra // Module that contains implementation of useful F#-specific // extension members for generic Matrix and Vector types @@ -37,7 +37,7 @@ module FSharpExtensions = // A type extension for the generic vector type that // adds the 'GetSlice' method to allow vec.[a .. b] syntax - type MathNet.Numerics.LinearAlgebra.Generic. + type MathNet.Numerics.LinearAlgebra. Vector<'T when 'T : struct and 'T : (new : unit -> 'T) and 'T :> System.IEquatable<'T> and 'T :> System.IFormattable and 'T :> System.ValueType> with @@ -61,7 +61,7 @@ module FSharpExtensions = // A type extension for the generic matrix type that // adds the 'GetSlice' method to allow m.[r1 .. r2, c1 .. c2] syntax - type MathNet.Numerics.LinearAlgebra.Generic. + type MathNet.Numerics.LinearAlgebra. Matrix<'T when 'T : struct and 'T : (new : unit -> 'T) and 'T :> System.IEquatable<'T> and 'T :> System.IFormattable and 'T :> System.ValueType> with diff --git a/src/FSharpUnitTests/DenseMatrixTests.fs b/src/FSharpUnitTests/DenseMatrixTests.fs index 1af975b2..1c69d08b 100644 --- a/src/FSharpUnitTests/DenseMatrixTests.fs +++ b/src/FSharpUnitTests/DenseMatrixTests.fs @@ -2,7 +2,7 @@ open NUnit.Framework open FsUnit -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra open MathNet.Numerics.LinearAlgebra.Double open MathNet.Numerics.Distributions open MathNet.Numerics.Statistics diff --git a/src/FSharpUnitTests/DenseVectorTests.fs b/src/FSharpUnitTests/DenseVectorTests.fs index b99a52f2..93ccaa22 100644 --- a/src/FSharpUnitTests/DenseVectorTests.fs +++ b/src/FSharpUnitTests/DenseVectorTests.fs @@ -2,7 +2,7 @@ open NUnit.Framework open FsUnit -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra open MathNet.Numerics.LinearAlgebra.Double open MathNet.Numerics.Distributions open MathNet.Numerics.Statistics diff --git a/src/FSharpUnitTests/MatrixTests.fs b/src/FSharpUnitTests/MatrixTests.fs index 2017ec03..2b641a39 100644 --- a/src/FSharpUnitTests/MatrixTests.fs +++ b/src/FSharpUnitTests/MatrixTests.fs @@ -2,7 +2,7 @@ open NUnit.Framework open FsUnit -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra open MathNet.Numerics.LinearAlgebra.Double /// Unit tests for the matrix type. diff --git a/src/FSharpUnitTests/SparseMatrixTests.fs b/src/FSharpUnitTests/SparseMatrixTests.fs index 87427163..8b4da053 100644 --- a/src/FSharpUnitTests/SparseMatrixTests.fs +++ b/src/FSharpUnitTests/SparseMatrixTests.fs @@ -2,7 +2,7 @@ open NUnit.Framework open FsUnit -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra open MathNet.Numerics.LinearAlgebra.Double /// Unit tests for the sparse matrix type. diff --git a/src/FSharpUnitTests/SparseVectorTests.fs b/src/FSharpUnitTests/SparseVectorTests.fs index 5e2470f8..3ed0c0f3 100644 --- a/src/FSharpUnitTests/SparseVectorTests.fs +++ b/src/FSharpUnitTests/SparseVectorTests.fs @@ -2,7 +2,7 @@ open NUnit.Framework open FsUnit -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra open MathNet.Numerics.LinearAlgebra.Double /// Unit tests for the sparse vector type. diff --git a/src/FSharpUnitTests/VectorTests.fs b/src/FSharpUnitTests/VectorTests.fs index a8430d2e..baed54b0 100644 --- a/src/FSharpUnitTests/VectorTests.fs +++ b/src/FSharpUnitTests/VectorTests.fs @@ -2,7 +2,7 @@ open NUnit.Framework open FsUnit -open MathNet.Numerics.LinearAlgebra.Generic +open MathNet.Numerics.LinearAlgebra open MathNet.Numerics.LinearAlgebra.Double /// Unit tests for the vector type. diff --git a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProviderOfT.cs b/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProviderOfT.cs index 7c4e4fdf..840eb35e 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProviderOfT.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProviderOfT.cs @@ -26,7 +26,7 @@ // INITIAL DRAFT MISSING EXCEPTION SPECIFICATIONS -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; namespace MathNet.Numerics.Algorithms.LinearAlgebra { diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs index 4e2163bb..5d92a5d5 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.Algorithms.LinearAlgebra { using System; using Properties; using Threading; using Numerics.LinearAlgebra.Complex.Factorization; - using Numerics.LinearAlgebra.Generic.Factorization; - #if NOSYSNUMERICS using Complex = Numerics.Complex; #else diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs index 27ef831e..2d270f34 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs @@ -24,13 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.Algorithms.LinearAlgebra { using System; using Properties; using Threading; using Numerics.LinearAlgebra.Complex32.Factorization; - using Numerics.LinearAlgebra.Generic.Factorization; using Numerics.LinearAlgebra.Complex32; #if !NOSYSNUMERICS diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs index 2ee35577..2f74b8b6 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.Algorithms.LinearAlgebra { using System; - using Numerics.LinearAlgebra.Generic.Factorization; using Properties; using Threading; diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs index ccfcb4ad..c4d97b29 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.Algorithms.LinearAlgebra { using System; - using Numerics.LinearAlgebra.Generic.Factorization; using Properties; using Threading; diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs index ae5e9805..c1f30ff9 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs @@ -30,7 +30,7 @@ #if NATIVEMKL -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl { diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs index 4baaa95c..b5e317c6 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs @@ -28,13 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + #if NATIVEMKL namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl { using System; using System.Security; - using Numerics.LinearAlgebra.Generic.Factorization; using Properties; /// diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs index 4a1d0432..cec3807d 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs @@ -28,6 +28,8 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + #if NATIVEMKL namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl @@ -35,7 +37,6 @@ namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl using System; using System.Numerics; using System.Security; - using Numerics.LinearAlgebra.Generic.Factorization; using Properties; /// diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs index 67f1ab7c..54230b96 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs +++ b/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs @@ -28,6 +28,8 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + #if NATIVEMKL namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl @@ -35,7 +37,6 @@ namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl using System; using System.Numerics; using System.Security; - using Numerics.LinearAlgebra.Generic.Factorization; using Properties; /// diff --git a/src/Numerics/Distributions/Multivariate/InverseWishart.cs b/src/Numerics/Distributions/Multivariate/InverseWishart.cs index acdee249..7f77efac 100644 --- a/src/Numerics/Distributions/Multivariate/InverseWishart.cs +++ b/src/Numerics/Distributions/Multivariate/InverseWishart.cs @@ -24,12 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; + namespace MathNet.Numerics.Distributions { using System; - using LinearAlgebra.Generic; - using LinearAlgebra.Generic.Factorization; - using Properties; /// /// This class implements functionality for the inverse Wishart distribution. This distribution is diff --git a/src/Numerics/Distributions/Multivariate/MatrixNormal.cs b/src/Numerics/Distributions/Multivariate/MatrixNormal.cs index 68eeb7e3..2f7702f1 100644 --- a/src/Numerics/Distributions/Multivariate/MatrixNormal.cs +++ b/src/Numerics/Distributions/Multivariate/MatrixNormal.cs @@ -24,13 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; + namespace MathNet.Numerics.Distributions { using System; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using LinearAlgebra.Generic.Factorization; - using Properties; /// /// This class implements functionality for matrix valued normal distributions. The distribution diff --git a/src/Numerics/Distributions/Multivariate/Multinomial.cs b/src/Numerics/Distributions/Multivariate/Multinomial.cs index 44a5c7ac..8ba2263b 100644 --- a/src/Numerics/Distributions/Multivariate/Multinomial.cs +++ b/src/Numerics/Distributions/Multivariate/Multinomial.cs @@ -26,13 +26,13 @@ namespace MathNet.Numerics.Distributions { - using System; - using System.Collections.Generic; - using System.Linq; + using LinearAlgebra; using LinearAlgebra.Double; - using LinearAlgebra.Generic; using Properties; using Statistics; + using System; + using System.Collections.Generic; + using System.Linq; /// /// Implements the multinomial distribution. For details about this distribution, see diff --git a/src/Numerics/Distributions/Multivariate/Wishart.cs b/src/Numerics/Distributions/Multivariate/Wishart.cs index b08630ef..bb114514 100644 --- a/src/Numerics/Distributions/Multivariate/Wishart.cs +++ b/src/Numerics/Distributions/Multivariate/Wishart.cs @@ -24,13 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; + namespace MathNet.Numerics.Distributions { using System; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using LinearAlgebra.Generic.Factorization; - using Properties; /// /// This class implements functionality for the Wishart distribution. This distribution is diff --git a/src/Numerics/Fit.cs b/src/Numerics/Fit.cs index 13dd2f5d..378e3edd 100644 --- a/src/Numerics/Fit.cs +++ b/src/Numerics/Fit.cs @@ -31,7 +31,7 @@ using System; using System.Linq; using MathNet.Numerics.LinearAlgebra.Double; -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; using MathNet.Numerics.Properties; namespace MathNet.Numerics diff --git a/src/Numerics/LinearAlgebra/Generic/Common.cs b/src/Numerics/LinearAlgebra/Common.cs similarity index 76% rename from src/Numerics/LinearAlgebra/Generic/Common.cs rename to src/Numerics/LinearAlgebra/Common.cs index 83f5a820..f766c708 100644 --- a/src/Numerics/LinearAlgebra/Generic/Common.cs +++ b/src/Numerics/LinearAlgebra/Common.cs @@ -28,7 +28,6 @@ // OTHER DEALINGS IN THE SOFTWARE. // - namespace MathNet.Numerics.LinearAlgebra { using System; @@ -37,6 +36,7 @@ namespace MathNet.Numerics.LinearAlgebra using Complex64 = Numerics.Complex; #else using Complex64 = System.Numerics.Complex; + #endif /// @@ -51,24 +51,24 @@ namespace MathNet.Numerics.LinearAlgebra /// The value of 1.0 for type T. public static T OneOf() { - if (typeof(T) == typeof(Complex64)) + if (typeof (T) == typeof (Complex64)) { - return (T)(object)Complex64.One; + return (T) (object) Complex64.One; } - if (typeof(T) == typeof(Numerics.Complex32)) + if (typeof (T) == typeof (Numerics.Complex32)) { - return (T)(object)Numerics.Complex32.One; + return (T) (object) Numerics.Complex32.One; } - if (typeof(T) == typeof(double)) + if (typeof (T) == typeof (double)) { - return (T)(object)1.0d; + return (T) (object) 1.0d; } - if (typeof(T) == typeof(float)) + if (typeof (T) == typeof (float)) { - return (T)(object)1.0f; + return (T) (object) 1.0f; } throw new NotSupportedException(); @@ -81,24 +81,24 @@ namespace MathNet.Numerics.LinearAlgebra /// The value of 0.0 for type T. public static T ZeroOf() { - if (typeof(T) == typeof(Complex64)) + if (typeof (T) == typeof (Complex64)) { - return (T)(object)Complex64.Zero; + return (T) (object) Complex64.Zero; } - if (typeof(T) == typeof(Numerics.Complex32)) + if (typeof (T) == typeof (Numerics.Complex32)) { - return (T)(object)Numerics.Complex32.Zero; + return (T) (object) Numerics.Complex32.Zero; } - if (typeof(T) == typeof(double)) + if (typeof (T) == typeof (double)) { - return (T)(object)0.0d; + return (T) (object) 0.0d; } - if (typeof(T) == typeof(float)) + if (typeof (T) == typeof (float)) { - return (T)(object)0.0f; + return (T) (object) 0.0f; } return default(T); diff --git a/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs index 93ab1d54..28d353f7 100644 --- a/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs @@ -28,18 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; namespace MathNet.Numerics.LinearAlgebra.Complex { - using Algorithms.LinearAlgebra; - using Distributions; - using Generic; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; #if NOSYSNUMERICS using Complex = Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/DenseVector.cs b/src/Numerics/LinearAlgebra/Complex/DenseVector.cs index 3ada831e..76ac6e18 100644 --- a/src/Numerics/LinearAlgebra/Complex/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex/DenseVector.cs @@ -28,21 +28,21 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex { - using Distributions; - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; - using Threading; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// @@ -681,7 +681,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex return _values.Aggregate(Complex.Zero, SpecialFunctions.Hypotenuse).Magnitude; } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(_values, (i, v) => v.Magnitude, Math.Max, 0d); } diff --git a/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs index 13cd8caf..8725c6f2 100644 --- a/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/DiagonalMatrix.cs @@ -28,21 +28,21 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex { - using Distributions; - using Generic; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/ExtensionMethods.cs b/src/Numerics/LinearAlgebra/Complex/ExtensionMethods.cs index ed8b14b2..22323f83 100644 --- a/src/Numerics/LinearAlgebra/Complex/ExtensionMethods.cs +++ b/src/Numerics/LinearAlgebra/Complex/ExtensionMethods.cs @@ -24,16 +24,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex { - using Factorization; - using Generic; - using Generic.Factorization; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/Cholesky.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/Cholesky.cs index 43321cc3..eb4707da 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/Cholesky.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/Cholesky.cs @@ -28,11 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using Generic.Factorization; - -#if NOSYSNUMERICS + #if NOSYSNUMERICS using Complex = Numerics.Complex; #else using Complex = System.Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseCholesky.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseCholesky.cs index 7e055269..f1c63c34 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseCholesky.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseCholesky.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseEvd.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseEvd.cs index d02462ed..cfd97139 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseEvd.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseEvd.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs index dd16c2e9..a3c4d78a 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs @@ -28,18 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseLU.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseLU.cs index d929a33e..dc39c99e 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseLU.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseLU.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseQR.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseQR.cs index f13edc17..c626177a 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseQR.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseQR.cs @@ -28,18 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseSvd.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseSvd.cs index 74cbcf1c..e73b3435 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseSvd.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseSvd.cs @@ -27,16 +27,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/Evd.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/Evd.cs index 2f112ab1..08645528 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/Evd.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/Evd.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using Generic.Factorization; - -#if NOSYSNUMERICS + #if NOSYSNUMERICS using Complex = Numerics.Complex; #else using Complex = System.Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/GramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/GramSchmidt.cs index 1e4ab0be..f57777aa 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/GramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/GramSchmidt.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { using System; - using Generic.Factorization; using Properties; #if NOSYSNUMERICS diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/LU.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/LU.cs index f717a561..8d98abff 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/LU.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/LU.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using Generic.Factorization; - -#if NOSYSNUMERICS + #if NOSYSNUMERICS using Complex = Numerics.Complex; #else using Complex = System.Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/QR.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/QR.cs index eadce8cc..129083c7 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/QR.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/QR.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { using System; - using Generic.Factorization; using Properties; #if NOSYSNUMERICS diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/Svd.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/Svd.cs index 7c37321a..97349866 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/Svd.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/Svd.cs @@ -28,18 +28,18 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using System.Linq; - using Generic; - using Generic.Factorization; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/UserCholesky.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/UserCholesky.cs index 56e8c0cc..c72356be 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/UserCholesky.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/UserCholesky.cs @@ -28,17 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; - using Threading; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/UserEvd.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/UserEvd.cs index 0fcafef5..e06969a6 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/UserEvd.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/UserEvd.cs @@ -27,16 +27,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/UserGramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/UserGramSchmidt.cs index 22a9311f..a392853c 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/UserGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/UserGramSchmidt.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/UserLU.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/UserLU.cs index e0c94163..60ff3ca7 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/UserLU.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/UserLU.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/UserQR.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/UserQR.cs index ddec19d9..c742e92e 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/UserQR.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/UserQR.cs @@ -28,20 +28,19 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; +using System.Linq; namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using System.Linq; - using Generic; - using Properties; - using Threading; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/UserSvd.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/UserSvd.cs index b705a084..ac3abff3 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/UserSvd.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/UserSvd.cs @@ -27,16 +27,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Matrix.cs b/src/Numerics/LinearAlgebra/Complex/Matrix.cs index 5841857e..6a7df912 100644 --- a/src/Numerics/LinearAlgebra/Complex/Matrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/Matrix.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; + namespace MathNet.Numerics.LinearAlgebra.Complex { - using System; - using Generic; - using Properties; - using Storage; #if NOSYSNUMERICS using Complex = Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/IIterativeSolver.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/IIterativeSolver.cs index 3f4fbe7e..53478ac0 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/IIterativeSolver.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/IIterativeSolver.cs @@ -28,10 +28,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers { - using Generic.Solvers.Status; - /// /// Defines the interface for classes that solve the matrix equation Ax = b in /// an iterative manner. diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/IIterator.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/IIterator.cs index 6ced8251..a8cd1935 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/IIterator.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/IIterator.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers { - using System; - using Generic.Solvers.Status; - using StopCriterium; - /// /// Defines the base interface for iterators that help control an iterative calculation. /// diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/BiCgStab.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/BiCgStab.cs index 2293b2ee..00faebe7 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/BiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/BiCgStab.cs @@ -28,12 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using System; +using MathNet.Numerics.Properties; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; #if NOSYSNUMERICS using Complex = Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs index f82d205b..a6e9084d 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Reflection; - using Generic.Solvers.Status; - using Properties; - /// /// A composite matrix solver. The actual solver is made by a sequence of /// matrix solvers. diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/GpBiCg.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/GpBiCg.cs index 2584d40a..b1fea710 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/GpBiCg.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/GpBiCg.cs @@ -28,12 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; #if NOSYSNUMERICS using Complex = Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/MlkBiCgStab.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/MlkBiCgStab.cs index f6d0f7db..b2989111 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/MlkBiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/MlkBiCgStab.cs @@ -28,16 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; - using Distributions; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; #if NOSYSNUMERICS using Complex = Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/TFQMR.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/TFQMR.cs index 785411ec..cf5de4fe 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/TFQMR.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/TFQMR.cs @@ -28,12 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; #if NOSYSNUMERICS using Complex = Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterator.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterator.cs index bf38da2b..48e8f8c7 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterator.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterator.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers { - using System; - using System.Collections.Generic; - using System.Linq; - using Generic.Solvers.Status; - using Properties; - using StopCriterium; - /// /// An iterator that is used to check if an iterative calculation should continue or stop. /// diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Preconditioners/IlutpElementSorter.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Preconditioners/IlutpElementSorter.cs index 62ce1a3b..fbb0d12c 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/Preconditioners/IlutpElementSorter.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Preconditioners/IlutpElementSorter.cs @@ -30,12 +30,11 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Preconditioners { - using Generic; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs index f2454e9b..5771201b 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Monitors an iterative calculation for signs of divergence. /// @@ -250,7 +250,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium // Store the infinity norms of both the solution and residual vectors // These values will be used to calculate the relative drop in residuals later on. - _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(Double.PositiveInfinity).Real; + _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(double.PositiveInfinity).Real; // Check if we have NaN's. If so we've gone way beyond normal divergence. // Stop the iteration. @@ -359,7 +359,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium /// Gets the which indicates what sort of stop criterium this /// monitors. /// - /// Returns . + /// Returns . public StopLevel StopLevel { [DebuggerStepThrough] diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs index dbcdbdb8..b9c23ffc 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals for NaN's. /// @@ -105,10 +105,10 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium } // Store the infinity norms of both the solution and residual vectors - var residualNorm = residualVector.Norm(Double.PositiveInfinity); - var solutionNorm = solutionVector.Norm(Double.PositiveInfinity); + var residualNorm = residualVector.Norm(double.PositiveInfinity); + var solutionNorm = solutionVector.Norm(double.PositiveInfinity); - if (Double.IsNaN(solutionNorm.Real) || Double.IsNaN(residualNorm.Real)) + if (double.IsNaN(solutionNorm.Real) || double.IsNaN(residualNorm.Real)) { SetStatusToFailed(); } diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IIterationStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IIterationStopCriterium.cs index 90a937ed..9f80bc7a 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IIterationStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IIterationStopCriterium.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium { - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// The base interface for classes that provide stop criteria for iterative calculations. /// diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IterationCountStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IterationCountStopCriterium.cs index e5948024..d88ed2ae 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IterationCountStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/IterationCountStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Defines an that monitors the numbers of iteration /// steps as stop criterium. diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs index 21812d83..f64b30b3 100644 --- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals as stop criterium. /// @@ -257,11 +257,11 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium // Store the infinity norms of both the solution and residual vectors // These values will be used to calculate the relative drop in residuals // later on. - var residualNorm = residualVector.Norm(Double.PositiveInfinity); + var residualNorm = residualVector.Norm(double.PositiveInfinity); // Check the residuals by calculating: // ||r_i|| <= stop_tol * ||b|| - var stopCriterium = ComputeStopCriterium(sourceVector.Norm(Double.PositiveInfinity).Real); + var stopCriterium = ComputeStopCriterium(sourceVector.Norm(double.PositiveInfinity).Real); // First check that we have real numbers not NaN's. // NaN's can occur when the iterative process diverges so we diff --git a/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs index 1e1bbdf2..f96df054 100644 --- a/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/SparseMatrix.cs @@ -28,18 +28,18 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using System; +using System.Collections.Generic; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex { - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex/SparseVector.cs b/src/Numerics/LinearAlgebra/Complex/SparseVector.cs index ca233a7d..454368c2 100644 --- a/src/Numerics/LinearAlgebra/Complex/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex/SparseVector.cs @@ -28,20 +28,20 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex { - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; - using Threading; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// @@ -846,7 +846,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex return _storage.Values.Aggregate(Complex.Zero, SpecialFunctions.Hypotenuse).Magnitude; } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(0, _storage.ValueCount, i => _storage.Values[i].Magnitude, Math.Max, 0d); } diff --git a/src/Numerics/LinearAlgebra/Complex/Vector.cs b/src/Numerics/LinearAlgebra/Complex/Vector.cs index 40320362..c668c4bb 100644 --- a/src/Numerics/LinearAlgebra/Complex/Vector.cs +++ b/src/Numerics/LinearAlgebra/Complex/Vector.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex { - using System; - using Generic; - using Storage; - using Threading; #if NOSYSNUMERICS using Complex = Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs index b477e6f5..e178745a 100644 --- a/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs @@ -28,19 +28,18 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using Algorithms.LinearAlgebra; - using Distributions; - using Generic; using Numerics; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; /// /// A Matrix class with dense storage. The underlying storage is a one dimensional array in column-major order (column by column). diff --git a/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs b/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs index 3cd87efa..0dcc52b3 100644 --- a/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex32/DenseVector.cs @@ -28,17 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using Distributions; - using Generic; using Numerics; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; - using Threading; /// /// A vector using dense storage. @@ -676,7 +676,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 return _values.Aggregate(Complex32.Zero, SpecialFunctions.Hypotenuse).Magnitude; } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(_values, (i, v) => v.Magnitude, Math.Max, 0f); } diff --git a/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs index 0f34aefa..ab0ad36c 100644 --- a/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/DiagonalMatrix.cs @@ -28,17 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using Distributions; - using Generic; using Numerics; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; /// /// A matrix type for diagonal matrices. diff --git a/src/Numerics/LinearAlgebra/Complex32/ExtensionMethods.cs b/src/Numerics/LinearAlgebra/Complex32/ExtensionMethods.cs index cc6c5856..cd5fced5 100644 --- a/src/Numerics/LinearAlgebra/Complex32/ExtensionMethods.cs +++ b/src/Numerics/LinearAlgebra/Complex32/ExtensionMethods.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using Factorization; - using Generic; - using Generic.Factorization; using Numerics; /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/Cholesky.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/Cholesky.cs index c86ce18b..794196e1 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/Cholesky.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/Cholesky.cs @@ -28,9 +28,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using Generic.Factorization; using Numerics; /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseCholesky.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseCholesky.cs index 6842128f..9dcd5a9a 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseCholesky.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseCholesky.cs @@ -31,10 +31,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { using System; - using Generic; using Numerics; using Properties; - using Threading; /// /// A class which encapsulates the functionality of a Cholesky factorization for dense matrices. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseEvd.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseEvd.cs index 96dea823..ed6d739d 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseEvd.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseEvd.cs @@ -28,13 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; - using Properties; - /// /// Eigenvalues and eigenvectors of a complex matrix. /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs index 258f037d..36fc85fa 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs @@ -28,14 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; /// /// A class which encapsulates the functionality of the QR decomposition Modified Gram-Schmidt Orthogonalization. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseLU.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseLU.cs index efa1b6b8..71c8cca8 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseLU.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseLU.cs @@ -28,13 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; - using Threading; /// /// A class which encapsulates the functionality of an LU factorization. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseQR.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseQR.cs index 1eb56b12..bcd0100b 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseQR.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseQR.cs @@ -28,14 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; /// /// A class which encapsulates the functionality of the QR decomposition. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseSvd.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseSvd.cs index 77cbe52c..be746e86 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseSvd.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseSvd.cs @@ -27,12 +27,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; /// /// A class which encapsulates the functionality of the singular value decomposition (SVD) for . diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/Evd.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/Evd.cs index 471aab25..a1073f55 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/Evd.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/Evd.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { using System; - using Generic.Factorization; using Numerics; #if NOSYSNUMERICS diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/GramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/GramSchmidt.cs index d183d7d8..0354c4d4 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/GramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/GramSchmidt.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { using System; - using Generic.Factorization; using Numerics; using Properties; diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/LU.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/LU.cs index 094b9f8d..573392e3 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/LU.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/LU.cs @@ -24,9 +24,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using Generic.Factorization; using Numerics; /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/QR.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/QR.cs index 02450a73..fd99b31e 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/QR.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/QR.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { using System; - using Generic.Factorization; using Numerics; using Properties; diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/Svd.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/Svd.cs index 5e3bd0ec..85262db1 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/Svd.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/Svd.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using System.Linq; - using Generic; - using Generic.Factorization; using Numerics; - using Properties; /// /// A class which encapsulates the functionality of the singular value decomposition (SVD). diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserCholesky.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserCholesky.cs index 418c3cdc..8d8867f0 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserCholesky.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserCholesky.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; - using Threading; /// /// A class which encapsulates the functionality of a Cholesky factorization for user matrices. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserEvd.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserEvd.cs index 7b18a7cf..ed079547 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserEvd.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserEvd.cs @@ -27,17 +27,16 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserGramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserGramSchmidt.cs index 01bb3013..8829274c 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserGramSchmidt.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; /// /// A class which encapsulates the functionality of the QR decomposition Modified Gram-Schmidt Orthogonalization. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserLU.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserLU.cs index b62ef19f..2e09244c 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserLU.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserLU.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; /// /// A class which encapsulates the functionality of an LU factorization. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserQR.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserQR.cs index d2677ebc..9a4a1482 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserQR.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserQR.cs @@ -28,16 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; +using System.Linq; namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using System.Linq; - using Generic; using Numerics; - using Properties; - using Threading; /// /// A class which encapsulates the functionality of the QR decomposition. diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserSvd.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserSvd.cs index c9aa3ecd..d4fc405b 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/UserSvd.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/UserSvd.cs @@ -27,12 +27,13 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { - using System; - using Generic; using Numerics; - using Properties; /// /// A class which encapsulates the functionality of the singular value decomposition (SVD) for . diff --git a/src/Numerics/LinearAlgebra/Complex32/Matrix.cs b/src/Numerics/LinearAlgebra/Complex32/Matrix.cs index 224eb290..a8d734a4 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Matrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Matrix.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using System; - using Generic; using Numerics; - using Properties; - using Storage; /// /// Complex32 version of the class. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterativeSolver.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterativeSolver.cs index 865cc5b2..b87f5b91 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterativeSolver.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterativeSolver.cs @@ -28,10 +28,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers { - using Generic.Solvers.Status; - /// /// Defines the interface for classes that solve the matrix equation Ax = b in /// an iterative manner. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterator.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterator.cs index 6fed7a21..c865439b 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterator.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/IIterator.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers { - using System; - using Generic.Solvers.Status; - using StopCriterium; - /// /// Defines the base interface for iterators that help control an iterative calculation. /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/BiCgStab.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/BiCgStab.cs index b23b4b24..02b3338c 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/BiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/BiCgStab.cs @@ -28,13 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Numerics; - using Preconditioners; - using Properties; + using Complex32 = Numerics.Complex32; /// /// A Bi-Conjugate Gradient stabilized iterative matrix solver. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs index 72a9d156..595bbc5d 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Reflection; - using Generic.Solvers.Status; - using Properties; - /// /// A composite matrix solver. The actual solver is made by a sequence of /// matrix solvers. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/GpBiCg.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/GpBiCg.cs index 26e5fa19..c06af12b 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/GpBiCg.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/GpBiCg.cs @@ -28,13 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative { - using System; - using Generic.Solvers.Status; using Numerics; - using Preconditioners; - using Properties; /// /// A Generalized Product Bi-Conjugate Gradient iterative matrix solver. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/MlkBiCgStab.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/MlkBiCgStab.cs index 9908b787..6d63e28a 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/MlkBiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/MlkBiCgStab.cs @@ -28,17 +28,18 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; - using Distributions; - using Generic.Solvers.Status; using Numerics; - using Preconditioners; - using Properties; /// /// A Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/TFQMR.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/TFQMR.cs index 7090da14..daa378a9 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/TFQMR.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/TFQMR.cs @@ -28,13 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Numerics; - using Preconditioners; - using Properties; + using Complex32 = Numerics.Complex32; /// /// A Transpose Free Quasi-Minimal Residual (TFQMR) iterative matrix solver. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterator.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterator.cs index a3f4ac84..e5dc4ad4 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterator.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterator.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers { - using System; - using System.Collections.Generic; - using System.Linq; - using Generic.Solvers.Status; - using Properties; - using StopCriterium; - /// /// An iterator that is used to check if an iterative calculation should continue or stop. /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs index 5c0852dc..c5e1b12a 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Monitors an iterative calculation for signs of divergence. /// @@ -250,7 +250,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium // Store the infinity norms of both the solution and residual vectors // These values will be used to calculate the relative drop in residuals later on. - _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(Double.PositiveInfinity).Real; + _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(double.PositiveInfinity).Real; // Check if we have NaN's. If so we've gone way beyond normal divergence. // Stop the iteration. @@ -359,7 +359,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium /// Gets the which indicates what sort of stop criterium this /// monitors. /// - /// Returns . + /// Returns . public StopLevel StopLevel { [DebuggerStepThrough] diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs index e2a48213..f312444a 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals for NaN's. /// @@ -105,10 +105,10 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium } // Store the infinity norms of both the solution and residual vectors - var residualNorm = residualVector.Norm(Double.PositiveInfinity); - var solutionNorm = solutionVector.Norm(Double.PositiveInfinity); + var residualNorm = residualVector.Norm(float.PositiveInfinity); + var solutionNorm = solutionVector.Norm(float.PositiveInfinity); - if (Single.IsNaN(solutionNorm.Real) || Single.IsNaN(residualNorm.Real)) + if (float.IsNaN(solutionNorm.Real) || float.IsNaN(residualNorm.Real)) { SetStatusToFailed(); } diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IIterationStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IIterationStopCriterium.cs index 93644fe0..1ae098f7 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IIterationStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IIterationStopCriterium.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium { - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// The base interface for classes that provide stop criteria for iterative calculations. /// diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IterationCountStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IterationCountStopCriterium.cs index 3ca44b0f..a01c4071 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IterationCountStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/IterationCountStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Defines an that monitors the numbers of iteration /// steps as stop criterium. diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs index fa4d5afa..b26aeea6 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals as stop criterium. /// diff --git a/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs index 40b1210a..5e7d0e86 100644 --- a/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/SparseMatrix.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using System; +using System.Collections.Generic; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using Generic; using Numerics; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; /// /// A Matrix with sparse storage, intended for very large matrices where most of the cells are zero. diff --git a/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs b/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs index bb2a5527..4d5f913d 100644 --- a/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Complex32/SparseVector.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using Generic; using Numerics; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; - using Threading; /// /// A vector with sparse storage, intended for very large vectors where most of the cells are zero. @@ -841,7 +841,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 return _storage.Values.Aggregate(Complex32.Zero, SpecialFunctions.Hypotenuse).Magnitude; } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(0, _storage.ValueCount, i => _storage.Values[i].Magnitude, Math.Max, 0f); } diff --git a/src/Numerics/LinearAlgebra/Complex32/Vector.cs b/src/Numerics/LinearAlgebra/Complex32/Vector.cs index b39d6c3c..a4eb06a3 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Vector.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Vector.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; + namespace MathNet.Numerics.LinearAlgebra.Complex32 { - using System; - using Generic; - using Storage; - using Threading; using Complex32 = Numerics.Complex32; /// diff --git a/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs index 3eb8b707..4a17e45e 100644 --- a/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs @@ -28,18 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Double { - using Algorithms.LinearAlgebra; - using Distributions; - using Generic; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using Threading; - /// /// A Matrix class with dense storage. The underlying storage is a one dimensional array in column-major order (column by column). /// diff --git a/src/Numerics/LinearAlgebra/Double/DenseVector.cs b/src/Numerics/LinearAlgebra/Double/DenseVector.cs index 047b6c21..8c0bdeb0 100644 --- a/src/Numerics/LinearAlgebra/Double/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Double/DenseVector.cs @@ -28,19 +28,18 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Double { - using Distributions; - using Generic; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Globalization; - using System.Linq; - using Threading; - /// /// A vector using dense storage. /// @@ -770,7 +769,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double return _values.Aggregate(0.0, SpecialFunctions.Hypotenuse); } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(_values, (i, v) => Math.Abs(v), Math.Max, 0d); } @@ -852,7 +851,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double // parsing var tokens = value.Split(new[] {formatProvider.GetTextInfo().ListSeparator, " ", "\t"}, StringSplitOptions.RemoveEmptyEntries); - var data = tokens.Select(t => Double.Parse(t, NumberStyles.Any, formatProvider)).ToArray(); + var data = tokens.Select(t => double.Parse(t, NumberStyles.Any, formatProvider)).ToArray(); if (data.Length == 0) throw new FormatException(); return new DenseVector(data); } diff --git a/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs index f40cc167..7a08146d 100644 --- a/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Double/DiagonalMatrix.cs @@ -29,7 +29,6 @@ // using MathNet.Numerics.Distributions; -using MathNet.Numerics.LinearAlgebra.Generic; using MathNet.Numerics.LinearAlgebra.Storage; using MathNet.Numerics.Properties; using MathNet.Numerics.Threading; diff --git a/src/Numerics/LinearAlgebra/Double/ExtensionMethods.cs b/src/Numerics/LinearAlgebra/Double/ExtensionMethods.cs index b00cdc6e..6a1cbd7c 100644 --- a/src/Numerics/LinearAlgebra/Double/ExtensionMethods.cs +++ b/src/Numerics/LinearAlgebra/Double/ExtensionMethods.cs @@ -24,12 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Double { - using Factorization; - using Generic; - using Generic.Factorization; - /// /// Extension methods which return factorizations for the various matrix classes. /// diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/Cholesky.cs b/src/Numerics/LinearAlgebra/Double/Factorization/Cholesky.cs index 14e29652..5765f053 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/Cholesky.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/Cholesky.cs @@ -28,10 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { using System; - using Generic.Factorization; /// /// A class which encapsulates the functionality of a Cholesky factorization. diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/DenseCholesky.cs b/src/Numerics/LinearAlgebra/Double/Factorization/DenseCholesky.cs index de4a3be9..512fa890 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/DenseCholesky.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/DenseCholesky.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of a Cholesky factorization for dense matrices. /// For a symmetric, positive definite matrix A, the Cholesky factorization diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/DenseEvd.cs b/src/Numerics/LinearAlgebra/Double/Factorization/DenseEvd.cs index c6e2af57..854857de 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/DenseEvd.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/DenseEvd.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs index f1b04b82..265712bd 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs @@ -28,14 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the QR decomposition Modified Gram-Schmidt Orthogonalization. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal mxn matrix and R is an nxn upper triangular matrix. diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/DenseLU.cs b/src/Numerics/LinearAlgebra/Double/Factorization/DenseLU.cs index a59b0044..55b788e2 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/DenseLU.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/DenseLU.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of an LU factorization. /// For a matrix A, the LU factorization is a pair of lower triangular matrix L and diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/DenseQR.cs b/src/Numerics/LinearAlgebra/Double/Factorization/DenseQR.cs index c92b1ac5..12e95d5c 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/DenseQR.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/DenseQR.cs @@ -28,14 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the QR decomposition. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal matrix diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/DenseSvd.cs b/src/Numerics/LinearAlgebra/Double/Factorization/DenseSvd.cs index 616fc992..016f6721 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/DenseSvd.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/DenseSvd.cs @@ -27,12 +27,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the singular value decomposition (SVD) for . /// Suppose M is an m-by-n matrix whose entries are real numbers. diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/Evd.cs b/src/Numerics/LinearAlgebra/Double/Factorization/Evd.cs index d87b523d..a585083a 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/Evd.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/Evd.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using Generic.Factorization; - -#if NOSYSNUMERICS + #if NOSYSNUMERICS using Complex = Numerics.Complex; #else using Complex = System.Numerics.Complex; diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/GramSchmidt.cs b/src/Numerics/LinearAlgebra/Double/Factorization/GramSchmidt.cs index 73eb2bac..d4305f67 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/GramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/GramSchmidt.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { using System; - using Generic.Factorization; using Properties; /// diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/LU.cs b/src/Numerics/LinearAlgebra/Double/Factorization/LU.cs index 2a99c206..4f9c09f2 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/LU.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/LU.cs @@ -24,10 +24,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using Generic.Factorization; - /// /// A class which encapsulates the functionality of an LU factorization. /// For a matrix A, the LU factorization is a pair of lower triangular matrix L and diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/QR.cs b/src/Numerics/LinearAlgebra/Double/Factorization/QR.cs index a6dba90d..0db05ed0 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/QR.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/QR.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { using System; - using Generic.Factorization; using Properties; /// diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/Svd.cs b/src/Numerics/LinearAlgebra/Double/Factorization/Svd.cs index 238bda49..47046dd3 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/Svd.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/Svd.cs @@ -28,14 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using System.Linq; - using Generic; - using Generic.Factorization; - using Properties; - /// /// A class which encapsulates the functionality of the singular value decomposition (SVD). /// Suppose M is an m-by-n matrix whose entries are real numbers. diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/UserCholesky.cs b/src/Numerics/LinearAlgebra/Double/Factorization/UserCholesky.cs index b2a04d44..5077b7fe 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/UserCholesky.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/UserCholesky.cs @@ -28,13 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - using Threading; - /// /// A class which encapsulates the functionality of a Cholesky factorization for user matrices. /// For a symmetric, positive definite matrix A, the Cholesky factorization diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/UserEvd.cs b/src/Numerics/LinearAlgebra/Double/Factorization/UserEvd.cs index 95796dba..1b72ddc1 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/UserEvd.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/UserEvd.cs @@ -27,16 +27,17 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/UserGramSchmidt.cs b/src/Numerics/LinearAlgebra/Double/Factorization/UserGramSchmidt.cs index c3c6fe6a..1773a852 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/UserGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/UserGramSchmidt.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the QR decomposition Modified Gram-Schmidt Orthogonalization. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal mxn matrix and R is an nxn upper triangular matrix. diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/UserLU.cs b/src/Numerics/LinearAlgebra/Double/Factorization/UserLU.cs index af9edc69..3eb39276 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/UserLU.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/UserLU.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of an LU factorization. /// For a matrix A, the LU factorization is a pair of lower triangular matrix L and diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/UserQR.cs b/src/Numerics/LinearAlgebra/Double/Factorization/UserQR.cs index b2246ec4..787770c2 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/UserQR.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/UserQR.cs @@ -28,16 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; +using System.Linq; namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using System.Linq; - using Generic; - using Properties; - using Threading; - /// /// A class which encapsulates the functionality of the QR decomposition. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal matrix diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/UserSvd.cs b/src/Numerics/LinearAlgebra/Double/Factorization/UserSvd.cs index 5f673d5f..9976d922 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/UserSvd.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/UserSvd.cs @@ -27,12 +27,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the singular value decomposition (SVD) for . /// Suppose M is an m-by-n matrix whose entries are real numbers. diff --git a/src/Numerics/LinearAlgebra/Double/Matrix.cs b/src/Numerics/LinearAlgebra/Double/Matrix.cs index ca203938..6c6b1232 100644 --- a/src/Numerics/LinearAlgebra/Double/Matrix.cs +++ b/src/Numerics/LinearAlgebra/Double/Matrix.cs @@ -28,13 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; + namespace MathNet.Numerics.LinearAlgebra.Double { - using Generic; - using Properties; - using Storage; - using System; - /// /// double version of the class. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/IIterativeSolver.cs b/src/Numerics/LinearAlgebra/Double/Solvers/IIterativeSolver.cs index 9c3ed963..a6b45d25 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/IIterativeSolver.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/IIterativeSolver.cs @@ -28,10 +28,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers { - using Generic.Solvers.Status; - /// /// Defines the interface for classes that solve the matrix equation Ax = b in /// an iterative manner. diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/IIterator.cs b/src/Numerics/LinearAlgebra/Double/Solvers/IIterator.cs index f595021b..c7fccaee 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/IIterator.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/IIterator.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers { - using System; - using Generic.Solvers.Status; - using StopCriterium; - /// /// Defines the base interface for iterators that help control an iterative calculation. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/BiCgStab.cs b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/BiCgStab.cs index b400b5ac..4c085fa2 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/BiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/BiCgStab.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs index 5f46056f..9cb92ad4 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Reflection; - using Generic.Solvers.Status; - using Properties; - /// /// A composite matrix solver. The actual solver is made by a sequence of /// matrix solvers. diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/GpBiCg.cs b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/GpBiCg.cs index c6b7077f..0fb78138 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/GpBiCg.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/GpBiCg.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Generalized Product Bi-Conjugate Gradient iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/MlkBiCgStab.cs b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/MlkBiCgStab.cs index 9f776611..8cb55b2a 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/MlkBiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/MlkBiCgStab.cs @@ -28,17 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Linq; - using Distributions; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/TFQMR.cs b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/TFQMR.cs index a89a586b..5d27d473 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/TFQMR.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/TFQMR.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Transpose Free Quasi-Minimal Residual (TFQMR) iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/Iterator.cs b/src/Numerics/LinearAlgebra/Double/Solvers/Iterator.cs index dfcd936d..5467ab30 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/Iterator.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/Iterator.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers { - using System; - using System.Collections.Generic; - using System.Linq; - using Generic.Solvers.Status; - using Properties; - using StopCriterium; - /// /// An iterator that is used to check if an iterative calculation should continue or stop. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs index a6b9db1f..273bac12 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Monitors an iterative calculation for signs of divergence. /// @@ -250,7 +250,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium // Store the infinity norms of both the solution and residual vectors // These values will be used to calculate the relative drop in residuals later on. - _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(Double.PositiveInfinity); + _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(double.PositiveInfinity); // Check if we have NaN's. If so we've gone way beyond normal divergence. // Stop the iteration. @@ -359,7 +359,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium /// Gets the which indicates what sort of stop criterium this /// monitors. /// - /// Returns . + /// Returns . public StopLevel StopLevel { [DebuggerStepThrough] diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs index 5e447746..93534927 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals for NaN's. /// @@ -105,10 +105,10 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium } // Store the infinity norms of both the solution and residual vectors - var residualNorm = residualVector.Norm(Double.PositiveInfinity); - var solutionNorm = solutionVector.Norm(Double.PositiveInfinity); + var residualNorm = residualVector.Norm(double.PositiveInfinity); + var solutionNorm = solutionVector.Norm(double.PositiveInfinity); - if (Double.IsNaN(solutionNorm) || Double.IsNaN(residualNorm)) + if (double.IsNaN(solutionNorm) || double.IsNaN(residualNorm)) { SetStatusToFailed(); } diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IIterationStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IIterationStopCriterium.cs index e58545dc..3f5fe6bc 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IIterationStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IIterationStopCriterium.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium { - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// The base interface for classes that provide stop criteria for iterative calculations. /// diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IterationCountStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IterationCountStopCriterium.cs index 7047fc5c..a78dd9d2 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IterationCountStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/IterationCountStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Defines an that monitors the numbers of iteration /// steps as stop criterium. diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs index 5c6b187d..d084ed50 100644 --- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals as stop criterium. /// @@ -257,11 +257,11 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium // Store the infinity norms of both the solution and residual vectors // These values will be used to calculate the relative drop in residuals // later on. - var residualNorm = residualVector.Norm(Double.PositiveInfinity); + var residualNorm = residualVector.Norm(double.PositiveInfinity); // Check the residuals by calculating: // ||r_i|| <= stop_tol * ||b|| - var stopCriterium = ComputeStopCriterium(sourceVector.Norm(Double.PositiveInfinity)); + var stopCriterium = ComputeStopCriterium(sourceVector.Norm(double.PositiveInfinity)); // First check that we have real numbers not NaN's. // NaN's can occur when the iterative process diverges so we diff --git a/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs index 700be355..12ea8bb2 100644 --- a/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Double/SparseMatrix.cs @@ -28,14 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using System; +using System.Collections.Generic; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Double { - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - /// /// A Matrix with sparse storage, intended for very large matrices where most of the cells are zero. /// The underlying storage scheme is 3-array compressed-sparse-row (CSR) Format. diff --git a/src/Numerics/LinearAlgebra/Double/SparseVector.cs b/src/Numerics/LinearAlgebra/Double/SparseVector.cs index 52828aea..17ff2785 100644 --- a/src/Numerics/LinearAlgebra/Double/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Double/SparseVector.cs @@ -28,17 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Double { - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Globalization; - using System.Linq; - using Threading; - /// /// A vector with sparse storage, intended for very large vectors where most of the cells are zero. /// @@ -874,7 +873,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double return _storage.Values.Aggregate(0.0, SpecialFunctions.Hypotenuse); } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(0, _storage.ValueCount, i => Math.Abs(_storage.Values[i]), Math.Max, 0d); } @@ -954,7 +953,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double // parsing var tokens = value.Split(new[] { formatProvider.GetTextInfo().ListSeparator, " ", "\t" }, StringSplitOptions.RemoveEmptyEntries); - var data = tokens.Select(t => Double.Parse(t, NumberStyles.Any, formatProvider)).ToList(); + var data = tokens.Select(t => double.Parse(t, NumberStyles.Any, formatProvider)).ToList(); if (data.Count == 0) throw new FormatException(); return OfEnumerable(data); } diff --git a/src/Numerics/LinearAlgebra/Double/Vector.cs b/src/Numerics/LinearAlgebra/Double/Vector.cs index 4de80d00..2f56c5b8 100644 --- a/src/Numerics/LinearAlgebra/Double/Vector.cs +++ b/src/Numerics/LinearAlgebra/Double/Vector.cs @@ -28,13 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; + namespace MathNet.Numerics.LinearAlgebra.Double { - using System; - using Generic; - using Storage; - using Threading; - /// /// double version of the class. /// @@ -352,7 +351,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double throw new ArgumentOutOfRangeException("p"); } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(0, Count, i => Math.Abs(At(i)), Math.Max, 0d); } diff --git a/src/Numerics/LinearAlgebra/Generic/Factorization/Cholesky.cs b/src/Numerics/LinearAlgebra/Factorization/Cholesky.cs similarity index 88% rename from src/Numerics/LinearAlgebra/Generic/Factorization/Cholesky.cs rename to src/Numerics/LinearAlgebra/Factorization/Cholesky.cs index ed7f5add..1f9a5179 100644 --- a/src/Numerics/LinearAlgebra/Generic/Factorization/Cholesky.cs +++ b/src/Numerics/LinearAlgebra/Factorization/Cholesky.cs @@ -28,16 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization +using System; + +namespace MathNet.Numerics.LinearAlgebra.Factorization { - using System; - using Generic; using Numerics; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// @@ -62,24 +60,24 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization { if (typeof(T) == typeof(double)) { - var dense = matrix as LinearAlgebra.Double.DenseMatrix; + var dense = matrix as Double.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Double.Factorization.DenseCholesky(dense) as Cholesky; + return new Double.Factorization.DenseCholesky(dense) as Cholesky; } - return new LinearAlgebra.Double.Factorization.UserCholesky(matrix as Matrix) as Cholesky; + return new Double.Factorization.UserCholesky(matrix as Matrix) as Cholesky; } if (typeof(T) == typeof(float)) { - var dense = matrix as LinearAlgebra.Single.DenseMatrix; + var dense = matrix as Single.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Single.Factorization.DenseCholesky(dense) as Cholesky; + return new Single.Factorization.DenseCholesky(dense) as Cholesky; } - return new LinearAlgebra.Single.Factorization.UserCholesky(matrix as Matrix) as Cholesky; + return new Single.Factorization.UserCholesky(matrix as Matrix) as Cholesky; } if (typeof(T) == typeof(Complex)) @@ -101,7 +99,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization return new LinearAlgebra.Complex32.Factorization.DenseCholesky(dense) as Cholesky; } - return new LinearAlgebra.Complex32.Factorization.UserCholesky(matrix as Matrix) as Cholesky; + return new LinearAlgebra.Complex32.Factorization.UserCholesky(matrix as Matrix) as Cholesky; } throw new NotSupportedException(); diff --git a/src/Numerics/LinearAlgebra/Generic/Factorization/Evd.cs b/src/Numerics/LinearAlgebra/Factorization/Evd.cs similarity index 91% rename from src/Numerics/LinearAlgebra/Generic/Factorization/Evd.cs rename to src/Numerics/LinearAlgebra/Factorization/Evd.cs index c59b1e2a..3526f874 100644 --- a/src/Numerics/LinearAlgebra/Generic/Factorization/Evd.cs +++ b/src/Numerics/LinearAlgebra/Factorization/Evd.cs @@ -28,16 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization +using System; + +namespace MathNet.Numerics.LinearAlgebra.Factorization { - using System; - using Generic; using Numerics; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// @@ -130,24 +128,24 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization { if (typeof(T) == typeof(double)) { - var dense = matrix as LinearAlgebra.Double.DenseMatrix; + var dense = matrix as Double.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Double.Factorization.DenseEvd(dense) as Evd; + return new Double.Factorization.DenseEvd(dense) as Evd; } - return new LinearAlgebra.Double.Factorization.UserEvd(matrix as Matrix) as Evd; + return new Double.Factorization.UserEvd(matrix as Matrix) as Evd; } if (typeof(T) == typeof(float)) { - var dense = matrix as LinearAlgebra.Single.DenseMatrix; + var dense = matrix as Single.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Single.Factorization.DenseEvd(dense) as Evd; + return new Single.Factorization.DenseEvd(dense) as Evd; } - return new LinearAlgebra.Single.Factorization.UserEvd(matrix as Matrix) as Evd; + return new Single.Factorization.UserEvd(matrix as Matrix) as Evd; } if (typeof(T) == typeof(Complex)) @@ -169,7 +167,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization return new LinearAlgebra.Complex32.Factorization.DenseEvd(dense) as Evd; } - return new LinearAlgebra.Complex32.Factorization.UserEvd(matrix as Matrix) as Evd; + return new LinearAlgebra.Complex32.Factorization.UserEvd(matrix as Matrix) as Evd; } throw new NotSupportedException(); diff --git a/src/Numerics/LinearAlgebra/Generic/Factorization/GramSchmidt.cs b/src/Numerics/LinearAlgebra/Factorization/GramSchmidt.cs similarity index 82% rename from src/Numerics/LinearAlgebra/Generic/Factorization/GramSchmidt.cs rename to src/Numerics/LinearAlgebra/Factorization/GramSchmidt.cs index 5de3cc4e..4e2f12aa 100644 --- a/src/Numerics/LinearAlgebra/Generic/Factorization/GramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Factorization/GramSchmidt.cs @@ -24,16 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization +using System; + +namespace MathNet.Numerics.LinearAlgebra.Factorization { - using System; - using Generic; using Numerics; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// @@ -56,24 +54,24 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization { if (typeof(T) == typeof(double)) { - var dense = matrix as LinearAlgebra.Double.DenseMatrix; + var dense = matrix as Double.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Double.Factorization.DenseGramSchmidt(dense) as GramSchmidt; + return new Double.Factorization.DenseGramSchmidt(dense) as GramSchmidt; } - return new LinearAlgebra.Double.Factorization.UserGramSchmidt(matrix as Matrix) as GramSchmidt; + return new Double.Factorization.UserGramSchmidt(matrix as Matrix) as GramSchmidt; } if (typeof(T) == typeof(float)) { - var dense = matrix as LinearAlgebra.Single.DenseMatrix; + var dense = matrix as Single.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Single.Factorization.DenseGramSchmidt(dense) as GramSchmidt; + return new Single.Factorization.DenseGramSchmidt(dense) as GramSchmidt; } - return new LinearAlgebra.Single.Factorization.UserGramSchmidt(matrix as Matrix) as GramSchmidt; + return new Single.Factorization.UserGramSchmidt(matrix as Matrix) as GramSchmidt; } if (typeof(T) == typeof(Complex)) diff --git a/src/Numerics/LinearAlgebra/Generic/Factorization/LU.cs b/src/Numerics/LinearAlgebra/Factorization/LU.cs similarity index 91% rename from src/Numerics/LinearAlgebra/Generic/Factorization/LU.cs rename to src/Numerics/LinearAlgebra/Factorization/LU.cs index 41d83854..1aa99889 100644 --- a/src/Numerics/LinearAlgebra/Generic/Factorization/LU.cs +++ b/src/Numerics/LinearAlgebra/Factorization/LU.cs @@ -24,16 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization +using System; + +namespace MathNet.Numerics.LinearAlgebra.Factorization { - using System; - using Generic; using Numerics; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// @@ -82,24 +80,24 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization { if (typeof(T) == typeof(double)) { - var dense = matrix as LinearAlgebra.Double.DenseMatrix; + var dense = matrix as Double.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Double.Factorization.DenseLU(dense) as LU; + return new Double.Factorization.DenseLU(dense) as LU; } - return new LinearAlgebra.Double.Factorization.UserLU(matrix as Matrix) as LU; + return new Double.Factorization.UserLU(matrix as Matrix) as LU; } if (typeof(T) == typeof(float)) { - var dense = matrix as LinearAlgebra.Single.DenseMatrix; + var dense = matrix as Single.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Single.Factorization.DenseLU(dense) as LU; + return new Single.Factorization.DenseLU(dense) as LU; } - return new LinearAlgebra.Single.Factorization.UserLU(matrix as Matrix) as LU; + return new Single.Factorization.UserLU(matrix as Matrix) as LU; } if (typeof(T) == typeof(Complex)) diff --git a/src/Numerics/LinearAlgebra/Generic/Factorization/QR.cs b/src/Numerics/LinearAlgebra/Factorization/QR.cs similarity index 91% rename from src/Numerics/LinearAlgebra/Generic/Factorization/QR.cs rename to src/Numerics/LinearAlgebra/Factorization/QR.cs index 83912ea7..280c7a26 100644 --- a/src/Numerics/LinearAlgebra/Generic/Factorization/QR.cs +++ b/src/Numerics/LinearAlgebra/Factorization/QR.cs @@ -24,16 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization +using System; + +namespace MathNet.Numerics.LinearAlgebra.Factorization { - using System; - using Generic; using Numerics; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// @@ -106,24 +104,24 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization if (typeof(T) == typeof(double)) { - var dense = matrix as LinearAlgebra.Double.DenseMatrix; + var dense = matrix as Double.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Double.Factorization.DenseQR(dense, method) as QR; + return new Double.Factorization.DenseQR(dense, method) as QR; } - return new LinearAlgebra.Double.Factorization.UserQR(matrix as Matrix, method) as QR; + return new Double.Factorization.UserQR(matrix as Matrix, method) as QR; } if (typeof(T) == typeof(float)) { - var dense = matrix as LinearAlgebra.Single.DenseMatrix; + var dense = matrix as Single.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Single.Factorization.DenseQR(dense, method) as QR; + return new Single.Factorization.DenseQR(dense, method) as QR; } - return new LinearAlgebra.Single.Factorization.UserQR(matrix as Matrix, method) as QR; + return new Single.Factorization.UserQR(matrix as Matrix, method) as QR; } if (typeof(T) == typeof(Complex)) diff --git a/src/Numerics/LinearAlgebra/Generic/Factorization/Svd.cs b/src/Numerics/LinearAlgebra/Factorization/Svd.cs similarity index 92% rename from src/Numerics/LinearAlgebra/Generic/Factorization/Svd.cs rename to src/Numerics/LinearAlgebra/Factorization/Svd.cs index ae79faa3..740f4e8a 100644 --- a/src/Numerics/LinearAlgebra/Generic/Factorization/Svd.cs +++ b/src/Numerics/LinearAlgebra/Factorization/Svd.cs @@ -28,17 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization +using MathNet.Numerics.Properties; +using System; + +namespace MathNet.Numerics.LinearAlgebra.Factorization { - using System; - using Generic; using Numerics; - using Properties; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// @@ -114,24 +112,24 @@ namespace MathNet.Numerics.LinearAlgebra.Generic.Factorization { if (typeof(T) == typeof(double)) { - var dense = matrix as LinearAlgebra.Double.DenseMatrix; + var dense = matrix as Double.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Double.Factorization.DenseSvd(dense, computeVectors) as Svd; + return new Double.Factorization.DenseSvd(dense, computeVectors) as Svd; } - return new LinearAlgebra.Double.Factorization.UserSvd(matrix as Matrix, computeVectors) as Svd; + return new Double.Factorization.UserSvd(matrix as Matrix, computeVectors) as Svd; } if (typeof(T) == typeof(float)) { - var dense = matrix as LinearAlgebra.Single.DenseMatrix; + var dense = matrix as Single.DenseMatrix; if (dense != null) { - return new LinearAlgebra.Single.Factorization.DenseSvd(dense, computeVectors) as Svd; + return new Single.Factorization.DenseSvd(dense, computeVectors) as Svd; } - return new LinearAlgebra.Single.Factorization.UserSvd(matrix as Matrix, computeVectors) as Svd; + return new Single.Factorization.UserSvd(matrix as Matrix, computeVectors) as Svd; } if (typeof(T) == typeof(Complex)) diff --git a/src/Numerics/LinearAlgebra/Generic/ISolver.cs b/src/Numerics/LinearAlgebra/ISolver.cs similarity index 97% rename from src/Numerics/LinearAlgebra/Generic/ISolver.cs rename to src/Numerics/LinearAlgebra/ISolver.cs index d7a77320..0e351629 100644 --- a/src/Numerics/LinearAlgebra/Generic/ISolver.cs +++ b/src/Numerics/LinearAlgebra/ISolver.cs @@ -28,11 +28,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { - using System; - /// /// Classes that solves a system of linear equations, AX = B. /// @@ -67,4 +66,4 @@ namespace MathNet.Numerics.LinearAlgebra.Generic /// The left hand side Matrix>, x. void Solve(Vector input, Vector result); } -} \ No newline at end of file +} diff --git a/src/Numerics/LinearAlgebra/Generic/Matrix.Arithmetic.cs b/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs similarity index 98% rename from src/Numerics/LinearAlgebra/Generic/Matrix.Arithmetic.cs rename to src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs index d93b8ec9..50a366f9 100644 --- a/src/Numerics/LinearAlgebra/Generic/Matrix.Arithmetic.cs +++ b/src/Numerics/LinearAlgebra/Matrix.Arithmetic.cs @@ -29,10 +29,10 @@ // using System; -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; using MathNet.Numerics.Properties; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { /// /// Defines the base class for Matrix classes. @@ -1075,7 +1075,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic /// The kronecker product of the two matrices. public virtual Matrix KroneckerProduct(Matrix other) { - var result = CreateMatrix(RowCount * other.RowCount, ColumnCount * other.ColumnCount); + var result = CreateMatrix(RowCount*other.RowCount, ColumnCount*other.ColumnCount); KroneckerProduct(other, result); return result; } @@ -1089,7 +1089,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic /// If the result matrix's dimensions are not (this.Rows * lower.rows) x (this.Columns * lower.Columns). public virtual void KroneckerProduct(Matrix other, Matrix result) { - if (result.RowCount != (RowCount * other.RowCount) || result.ColumnCount != (ColumnCount * other.ColumnCount)) + if (result.RowCount != (RowCount*other.RowCount) || result.ColumnCount != (ColumnCount*other.ColumnCount)) { throw DimensionsDontMatch(this, other, result); } @@ -1098,7 +1098,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic { for (var i = 0; i < RowCount; i++) { - result.SetSubMatrix(i * other.RowCount, other.RowCount, j * other.ColumnCount, other.ColumnCount, At(i, j) * other); + result.SetSubMatrix(i*other.RowCount, other.RowCount, j*other.ColumnCount, other.ColumnCount, At(i, j)*other); } } } @@ -1196,14 +1196,14 @@ namespace MathNet.Numerics.LinearAlgebra.Generic return DimensionsDontMatch(left.ToColumnMatrix(), right.ToColumnMatrix(), paramName); } - private static Exception CreateException(string message, string paramName = null) + static Exception CreateException(string message, string paramName = null) where TException : Exception { - if (typeof(TException) == typeof(ArgumentException)) + if (typeof (TException) == typeof (ArgumentException)) { return new ArgumentException(message, paramName); } - if (typeof(TException) == typeof(ArgumentOutOfRangeException)) + if (typeof (TException) == typeof (ArgumentOutOfRangeException)) { return new ArgumentOutOfRangeException(paramName, message); } diff --git a/src/Numerics/LinearAlgebra/Generic/Matrix.BCL.cs b/src/Numerics/LinearAlgebra/Matrix.BCL.cs similarity index 98% rename from src/Numerics/LinearAlgebra/Generic/Matrix.BCL.cs rename to src/Numerics/LinearAlgebra/Matrix.BCL.cs index e758aecd..73601aca 100644 --- a/src/Numerics/LinearAlgebra/Generic/Matrix.BCL.cs +++ b/src/Numerics/LinearAlgebra/Matrix.BCL.cs @@ -32,7 +32,7 @@ using System; using System.Diagnostics; using System.Text; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { [DebuggerDisplay("Matrix {RowCount}x{ColumnCount}")] public abstract partial class Matrix @@ -95,7 +95,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic /// public virtual string ToTypeString() { - return string.Format("{0} {1}x{2}-{3}", GetType().Name, RowCount, ColumnCount, typeof(T).Name); + return string.Format("{0} {1}x{2}-{3}", GetType().Name, RowCount, ColumnCount, typeof (T).Name); } /// diff --git a/src/Numerics/LinearAlgebra/Generic/Matrix.Operators.cs b/src/Numerics/LinearAlgebra/Matrix.Operators.cs similarity index 99% rename from src/Numerics/LinearAlgebra/Generic/Matrix.Operators.cs rename to src/Numerics/LinearAlgebra/Matrix.Operators.cs index d5fde258..6b615b4b 100644 --- a/src/Numerics/LinearAlgebra/Generic/Matrix.Operators.cs +++ b/src/Numerics/LinearAlgebra/Matrix.Operators.cs @@ -31,7 +31,7 @@ using System; using System.Runtime.CompilerServices; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { /// /// Defines the base class for Matrix classes. diff --git a/src/Numerics/LinearAlgebra/Generic/Matrix.cs b/src/Numerics/LinearAlgebra/Matrix.cs similarity index 99% rename from src/Numerics/LinearAlgebra/Generic/Matrix.cs rename to src/Numerics/LinearAlgebra/Matrix.cs index 01c6f89b..f6d75965 100644 --- a/src/Numerics/LinearAlgebra/Generic/Matrix.cs +++ b/src/Numerics/LinearAlgebra/Matrix.cs @@ -28,16 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Runtime; + +namespace MathNet.Numerics.LinearAlgebra { - using Factorization; - using Numerics; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Runtime; - /// /// Defines the base class for Matrix classes. /// @@ -156,7 +155,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic throw new ArgumentOutOfRangeException("columnIndex"); } - Storage.Clear(0,RowCount,columnIndex,1); + Storage.Clear(0, RowCount, columnIndex, 1); } /// diff --git a/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs index 781ec9ad..5b64d1ab 100644 --- a/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs @@ -28,18 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Single { - using Algorithms.LinearAlgebra; - using Distributions; - using Generic; - using Properties; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using Threading; - /// /// A Matrix class with dense storage. The underlying storage is a one dimensional array in column-major order (column by column). /// diff --git a/src/Numerics/LinearAlgebra/Single/DenseVector.cs b/src/Numerics/LinearAlgebra/Single/DenseVector.cs index dd1581cf..814436a4 100644 --- a/src/Numerics/LinearAlgebra/Single/DenseVector.cs +++ b/src/Numerics/LinearAlgebra/Single/DenseVector.cs @@ -28,18 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Single { - using Distributions; - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Globalization; - using System.Linq; - using Threading; - /// /// A vector using dense storage. /// @@ -759,7 +758,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single return _values.Aggregate(0f, SpecialFunctions.Hypotenuse); } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(_values, (i, v) => Math.Abs(v), Math.Max, 0f); } @@ -842,7 +841,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single // parsing var tokens = value.Split(new[] { formatProvider.GetTextInfo().ListSeparator, " ", "\t" }, StringSplitOptions.RemoveEmptyEntries); - var data = tokens.Select(t => Single.Parse(t, NumberStyles.Any, formatProvider)).ToArray(); + var data = tokens.Select(t => float.Parse(t, NumberStyles.Any, formatProvider)).ToArray(); if (data.Length == 0) throw new FormatException(); return new DenseVector(data); } diff --git a/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs b/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs index 90d345a4..39a27225 100644 --- a/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs +++ b/src/Numerics/LinearAlgebra/Single/DiagonalMatrix.cs @@ -29,7 +29,6 @@ // using MathNet.Numerics.Distributions; -using MathNet.Numerics.LinearAlgebra.Generic; using MathNet.Numerics.LinearAlgebra.Storage; using MathNet.Numerics.Properties; using MathNet.Numerics.Threading; diff --git a/src/Numerics/LinearAlgebra/Single/ExtensionMethods.cs b/src/Numerics/LinearAlgebra/Single/ExtensionMethods.cs index 720c14d1..1c495160 100644 --- a/src/Numerics/LinearAlgebra/Single/ExtensionMethods.cs +++ b/src/Numerics/LinearAlgebra/Single/ExtensionMethods.cs @@ -24,12 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.LinearAlgebra.Single.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Single { - using Factorization; - using Generic; - using Generic.Factorization; - /// /// Extension methods which return factorizations for the various matrix classes. /// diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/Cholesky.cs b/src/Numerics/LinearAlgebra/Single/Factorization/Cholesky.cs index aed2a823..5fb8d79e 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/Cholesky.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/Cholesky.cs @@ -28,10 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { using System; - using Generic.Factorization; /// /// A class which encapsulates the functionality of a Cholesky factorization. diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/DenseCholesky.cs b/src/Numerics/LinearAlgebra/Single/Factorization/DenseCholesky.cs index 811f4212..e7d352d0 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/DenseCholesky.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/DenseCholesky.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of a Cholesky factorization for dense matrices. /// For a symmetric, positive definite matrix A, the Cholesky factorization diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/DenseEvd.cs b/src/Numerics/LinearAlgebra/Single/Factorization/DenseEvd.cs index 562e969e..8301a2cc 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/DenseEvd.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/DenseEvd.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; #if NOSYSNUMERICS - using Complex = Numerics.Complex; + using Numerics; #else - using Complex = System.Numerics.Complex; + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs index 04ce0aad..336a42b8 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs @@ -28,14 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the QR decomposition Modified Gram-Schmidt Orthogonalization. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal mxn matrix and R is an nxn upper triangular matrix. diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/DenseLU.cs b/src/Numerics/LinearAlgebra/Single/Factorization/DenseLU.cs index 8f41adac..383053e9 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/DenseLU.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/DenseLU.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of an LU factorization. /// For a matrix A, the LU factorization is a pair of lower triangular matrix L and diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/DenseQR.cs b/src/Numerics/LinearAlgebra/Single/Factorization/DenseQR.cs index 474e1e5a..18a2285a 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/DenseQR.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/DenseQR.cs @@ -28,14 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the QR decomposition. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal matrix diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/DenseSvd.cs b/src/Numerics/LinearAlgebra/Single/Factorization/DenseSvd.cs index 16ae5c46..292582e1 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/DenseSvd.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/DenseSvd.cs @@ -27,12 +27,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the singular value decomposition (SVD) for . /// Suppose M is an m-by-n matrix whose entries are real numbers. diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/Evd.cs b/src/Numerics/LinearAlgebra/Single/Factorization/Evd.cs index af65d919..08d04161 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/Evd.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/Evd.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { using System; - using Generic.Factorization; - #if NOSYSNUMERICS using Complex = Numerics.Complex; #else diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/GramSchmidt.cs b/src/Numerics/LinearAlgebra/Single/Factorization/GramSchmidt.cs index 2a81948e..9b26dc26 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/GramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/GramSchmidt.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { using System; - using Generic.Factorization; using Properties; /// diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/LU.cs b/src/Numerics/LinearAlgebra/Single/Factorization/LU.cs index 36de622d..792417d8 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/LU.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/LU.cs @@ -24,10 +24,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using Generic.Factorization; - /// /// A class which encapsulates the functionality of an LU factorization. /// For a matrix A, the LU factorization is a pair of lower triangular matrix L and diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/QR.cs b/src/Numerics/LinearAlgebra/Single/Factorization/QR.cs index cb84c150..dfdf6b5e 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/QR.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/QR.cs @@ -24,10 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { using System; - using Generic.Factorization; using Properties; /// diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/Svd.cs b/src/Numerics/LinearAlgebra/Single/Factorization/Svd.cs index 61016cfb..6f8035b0 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/Svd.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/Svd.cs @@ -28,14 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using System.Linq; - using Generic; - using Generic.Factorization; - using Properties; - /// /// A class which encapsulates the functionality of the singular value decomposition (SVD). /// Suppose M is an m-by-n matrix whose entries are real numbers. diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/UserCholesky.cs b/src/Numerics/LinearAlgebra/Single/Factorization/UserCholesky.cs index d813d63b..9cd6e4e9 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/UserCholesky.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/UserCholesky.cs @@ -28,13 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - using Threading; - /// /// A class which encapsulates the functionality of a Cholesky factorization for user matrices. /// For a symmetric, positive definite matrix A, the Cholesky factorization diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/UserEvd.cs b/src/Numerics/LinearAlgebra/Single/Factorization/UserEvd.cs index 49fb348d..2cf90ab6 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/UserEvd.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/UserEvd.cs @@ -27,17 +27,16 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; using Numerics; - using Properties; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else - using Complex = System.Numerics.Complex; +#if !NOSYSNUMERICS + using System.Numerics; #endif /// diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/UserGramSchmidt.cs b/src/Numerics/LinearAlgebra/Single/Factorization/UserGramSchmidt.cs index 0dbd9ca3..2b33f843 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/UserGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/UserGramSchmidt.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the QR decomposition Modified Gram-Schmidt Orthogonalization. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal mxn matrix and R is an nxn upper triangular matrix. diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/UserLU.cs b/src/Numerics/LinearAlgebra/Single/Factorization/UserLU.cs index 5bab394e..ac250200 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/UserLU.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/UserLU.cs @@ -28,12 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of an LU factorization. /// For a matrix A, the LU factorization is a pair of lower triangular matrix L and diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/UserQR.cs b/src/Numerics/LinearAlgebra/Single/Factorization/UserQR.cs index 6aad3dcb..0103be7b 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/UserQR.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/UserQR.cs @@ -28,16 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; +using System.Linq; namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using System.Linq; - using Generic; - using Properties; - using Threading; - /// /// A class which encapsulates the functionality of the QR decomposition. /// Any real square matrix A may be decomposed as A = QR where Q is an orthogonal matrix diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/UserSvd.cs b/src/Numerics/LinearAlgebra/Single/Factorization/UserSvd.cs index c7dfafa9..37060291 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/UserSvd.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/UserSvd.cs @@ -27,12 +27,12 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { - using System; - using Generic; - using Properties; - /// /// A class which encapsulates the functionality of the singular value decomposition (SVD) for . /// Suppose M is an m-by-n matrix whose entries are real numbers. diff --git a/src/Numerics/LinearAlgebra/Single/Matrix.cs b/src/Numerics/LinearAlgebra/Single/Matrix.cs index fb4c4e96..8f5b37cb 100644 --- a/src/Numerics/LinearAlgebra/Single/Matrix.cs +++ b/src/Numerics/LinearAlgebra/Single/Matrix.cs @@ -28,13 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Properties; + namespace MathNet.Numerics.LinearAlgebra.Single { - using System; - using Generic; - using Properties; - using Storage; - /// /// float version of the class. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/IIterativeSolver.cs b/src/Numerics/LinearAlgebra/Single/Solvers/IIterativeSolver.cs index ebd06d3c..ce385e16 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/IIterativeSolver.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/IIterativeSolver.cs @@ -28,10 +28,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers { - using Generic.Solvers.Status; - /// /// Defines the interface for classes that solve the matrix equation Ax = b in /// an iterative manner. diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/IIterator.cs b/src/Numerics/LinearAlgebra/Single/Solvers/IIterator.cs index 801fa697..c802bb8d 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/IIterator.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/IIterator.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers { - using System; - using Generic.Solvers.Status; - using StopCriterium; - /// /// Defines the base interface for iterators that help control an iterative calculation. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/BiCgStab.cs b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/BiCgStab.cs index 209a24aa..8b4553f9 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/BiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/BiCgStab.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs index 04f2cc35..307e5074 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.IO; - using System.Linq; - using System.Reflection; - using Generic.Solvers.Status; - using Properties; - /// /// A composite matrix solver. The actual solver is made by a sequence of /// matrix solvers. diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/GpBiCg.cs b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/GpBiCg.cs index 29cdc8f4..e17eed1c 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/GpBiCg.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/GpBiCg.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Generalized Product Bi-Conjugate Gradient iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/MlkBiCgStab.cs b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/MlkBiCgStab.cs index 056b1195..8cb4e003 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/MlkBiCgStab.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/MlkBiCgStab.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative { - using System; - using System.Collections.Generic; - using System.Diagnostics; - using Distributions; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/TFQMR.cs b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/TFQMR.cs index 59c19827..ecb6428d 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/TFQMR.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/TFQMR.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Preconditioners; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative { - using System; - using Generic.Solvers.Status; - using Preconditioners; - using Properties; - /// /// A Transpose Free Quasi-Minimal Residual (TFQMR) iterative matrix solver. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/Iterator.cs b/src/Numerics/LinearAlgebra/Single/Solvers/Iterator.cs index 3f2d0255..a04f890c 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/Iterator.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/Iterator.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.Properties; +using System; +using System.Collections.Generic; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers { - using System; - using System.Collections.Generic; - using System.Linq; - using Generic.Solvers.Status; - using Properties; - using StopCriterium; - /// /// An iterator that is used to check if an iterative calculation should continue or stop. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs index 8da980ed..9df1458b 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Monitors an iterative calculation for signs of divergence. /// @@ -250,7 +250,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium // Store the infinity norms of both the solution and residual vectors // These values will be used to calculate the relative drop in residuals later on. - _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(Double.PositiveInfinity); + _residualHistory[_residualHistory.Length - 1] = residualVector.Norm(double.PositiveInfinity); // Check if we have NaN's. If so we've gone way beyond normal divergence. // Stop the iteration. @@ -359,7 +359,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium /// Gets the which indicates what sort of stop criterium this /// monitors. /// - /// Returns . + /// Returns . public StopLevel StopLevel { [DebuggerStepThrough] diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs index 92a4cc98..19907563 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals for NaN's. /// @@ -105,10 +105,10 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium } // Store the infinity norms of both the solution and residual vectors - var residualNorm = residualVector.Norm(Double.PositiveInfinity); - var solutionNorm = solutionVector.Norm(Double.PositiveInfinity); + var residualNorm = residualVector.Norm(double.PositiveInfinity); + var solutionNorm = solutionVector.Norm(double.PositiveInfinity); - if (Double.IsNaN(solutionNorm) || Double.IsNaN(residualNorm)) + if (float.IsNaN(solutionNorm) || float.IsNaN(residualNorm)) { SetStatusToFailed(); } diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IIterationStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IIterationStopCriterium.cs index 389ac7bc..94286cb5 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IIterationStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IIterationStopCriterium.cs @@ -24,11 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium { - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// The base interface for classes that provide stop criteria for iterative calculations. /// diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IterationCountStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IterationCountStopCriterium.cs index 4db059c8..da7e7b84 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IterationCountStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/IterationCountStopCriterium.cs @@ -28,13 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - /// /// Defines an that monitors the numbers of iteration /// steps as stop criterium. diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs index 8cead811..5d6ad077 100644 --- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs +++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium; +using MathNet.Numerics.Properties; +using System; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium { - using System; - using System.Diagnostics; - using Generic.Solvers.Status; - using Generic.Solvers.StopCriterium; - using Properties; - /// /// Defines an that monitors residuals as stop criterium. /// diff --git a/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs b/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs index 9c09128c..a87f50ad 100644 --- a/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Single/SparseMatrix.cs @@ -28,14 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using System; +using System.Collections.Generic; +using System.Diagnostics; + namespace MathNet.Numerics.LinearAlgebra.Single { - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - /// /// A Matrix with sparse storage, intended for very large matrices where most of the cells are zero. /// The underlying storage scheme is 3-array compressed-sparse-row (CSR) Format. diff --git a/src/Numerics/LinearAlgebra/Single/SparseVector.cs b/src/Numerics/LinearAlgebra/Single/SparseVector.cs index ac765780..caa7f492 100644 --- a/src/Numerics/LinearAlgebra/Single/SparseVector.cs +++ b/src/Numerics/LinearAlgebra/Single/SparseVector.cs @@ -28,17 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.Linq; + namespace MathNet.Numerics.LinearAlgebra.Single { - using Generic; - using Storage; - using System; - using System.Collections.Generic; - using System.Diagnostics; - using System.Globalization; - using System.Linq; - using Threading; - /// /// A vector with sparse storage, intended for very large vectors where most of the cells are zero. /// @@ -878,7 +877,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single return _storage.Values.Aggregate(0f, SpecialFunctions.Hypotenuse); } - if (Double.IsPositiveInfinity(p)) + if (double.IsPositiveInfinity(p)) { return CommonParallel.Aggregate(0, _storage.ValueCount, i => Math.Abs(_storage.Values[i]), Math.Max, 0f); } @@ -958,7 +957,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single // parsing var tokens = value.Split(new[] { formatProvider.GetTextInfo().ListSeparator, " ", "\t" }, StringSplitOptions.RemoveEmptyEntries); - var data = tokens.Select(t => Single.Parse(t, NumberStyles.Any, formatProvider)).ToList(); + var data = tokens.Select(t => float.Parse(t, NumberStyles.Any, formatProvider)).ToList(); if (data.Count == 0) throw new FormatException(); return OfEnumerable(data); } diff --git a/src/Numerics/LinearAlgebra/Single/Vector.cs b/src/Numerics/LinearAlgebra/Single/Vector.cs index 1199d759..b327ab72 100644 --- a/src/Numerics/LinearAlgebra/Single/Vector.cs +++ b/src/Numerics/LinearAlgebra/Single/Vector.cs @@ -28,13 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Storage; +using MathNet.Numerics.Threading; +using System; + namespace MathNet.Numerics.LinearAlgebra.Single { - using System; - using Generic; - using Storage; - using Threading; - /// /// float version of the class. /// diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationCancelled.cs b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationCancelled.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationCancelled.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/CalculationCancelled.cs index cc358517..13a9df33 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationCancelled.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationCancelled.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Indicates that a calculation was cancelled by the user. diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationConverged.cs b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationConverged.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationConverged.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/CalculationConverged.cs index 134f1f55..0a2e9f6b 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationConverged.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationConverged.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Indicates that a calculation has converged to the desired convergence levels. diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationDiverged.cs b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationDiverged.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationDiverged.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/CalculationDiverged.cs index ba330a3e..ff9f22d7 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationDiverged.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationDiverged.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Indicates that the calculation diverged. diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationFailure.cs b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationFailure.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationFailure.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/CalculationFailure.cs index 932e6625..7d85b420 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationFailure.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationFailure.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Indicates that a calculation has failed for some reason. diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationIndetermined.cs b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationIndetermined.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationIndetermined.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/CalculationIndetermined.cs index 50e6d603..9d98c671 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationIndetermined.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationIndetermined.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Indicates that the state of the calculation is indetermined, not started or stopped. diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationRunning.cs b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationRunning.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationRunning.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/CalculationRunning.cs index 71a7f575..bb431efe 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationRunning.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationRunning.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Indicates that the calculation is running and no results are yet known. diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationStoppedWithoutConvergence.cs b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationStoppedWithoutConvergence.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationStoppedWithoutConvergence.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/CalculationStoppedWithoutConvergence.cs index 92b4dd0c..72029810 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/CalculationStoppedWithoutConvergence.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/CalculationStoppedWithoutConvergence.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Indicates that the calculation has been stopped due to reaching the stopping diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/ICalculationStatus.cs b/src/Numerics/LinearAlgebra/Solvers/Status/ICalculationStatus.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/Status/ICalculationStatus.cs rename to src/Numerics/LinearAlgebra/Solvers/Status/ICalculationStatus.cs index 2cf8810b..7b07f2b5 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/Status/ICalculationStatus.cs +++ b/src/Numerics/LinearAlgebra/Solvers/Status/ICalculationStatus.cs @@ -28,7 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.Status +namespace MathNet.Numerics.LinearAlgebra.Solvers.Status { /// /// Defines the base interface for calculation status objects. diff --git a/src/Numerics/LinearAlgebra/Generic/Solvers/StopCriterium/StopLevel.cs b/src/Numerics/LinearAlgebra/Solvers/StopCriterium/StopLevel.cs similarity index 96% rename from src/Numerics/LinearAlgebra/Generic/Solvers/StopCriterium/StopLevel.cs rename to src/Numerics/LinearAlgebra/Solvers/StopCriterium/StopLevel.cs index b9f71763..bcf7b3a1 100644 --- a/src/Numerics/LinearAlgebra/Generic/Solvers/StopCriterium/StopLevel.cs +++ b/src/Numerics/LinearAlgebra/Solvers/StopCriterium/StopLevel.cs @@ -24,7 +24,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -namespace MathNet.Numerics.LinearAlgebra.Generic.Solvers.StopCriterium +namespace MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium { /// /// Iteration stop criteria. diff --git a/src/Numerics/LinearAlgebra/Generic/Vector.Arithmetic.cs b/src/Numerics/LinearAlgebra/Vector.Arithmetic.cs similarity index 99% rename from src/Numerics/LinearAlgebra/Generic/Vector.Arithmetic.cs rename to src/Numerics/LinearAlgebra/Vector.Arithmetic.cs index 121ce867..ed236886 100644 --- a/src/Numerics/LinearAlgebra/Generic/Vector.Arithmetic.cs +++ b/src/Numerics/LinearAlgebra/Vector.Arithmetic.cs @@ -31,7 +31,7 @@ using System; using MathNet.Numerics.Properties; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { public abstract partial class Vector { diff --git a/src/Numerics/LinearAlgebra/Generic/Vector.BCL.cs b/src/Numerics/LinearAlgebra/Vector.BCL.cs similarity index 97% rename from src/Numerics/LinearAlgebra/Generic/Vector.BCL.cs rename to src/Numerics/LinearAlgebra/Vector.BCL.cs index 0c6c171b..b58268ac 100644 --- a/src/Numerics/LinearAlgebra/Generic/Vector.BCL.cs +++ b/src/Numerics/LinearAlgebra/Vector.BCL.cs @@ -36,7 +36,7 @@ using System.Text; using MathNet.Numerics.LinearAlgebra.Storage; using MathNet.Numerics.Properties; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { [DebuggerDisplay("Vector {Count}")] public abstract partial class Vector @@ -161,7 +161,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic object IList.this[int index] { get { return Storage[index]; } - set { Storage[index] = (T)value; } + set { Storage[index] = (T) value; } } int IList.IndexOf(object value) @@ -171,7 +171,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic return -1; } - return ((IList)this).IndexOf((T)value); + return ((IList) this).IndexOf((T) value); } bool IList.Contains(object value) @@ -181,7 +181,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic return false; } - return ((ICollection)this).Contains((T)value); + return ((ICollection) this).Contains((T) value); } void IList.Insert(int index, object value) @@ -225,7 +225,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic throw new ArgumentException(Resources.ArgumentSingleDimensionArray, "array"); } - Storage.CopySubVectorTo(new DenseVectorStorage(array.Length, (T[])array), 0, index, Count); + Storage.CopySubVectorTo(new DenseVectorStorage(array.Length, (T[]) array), 0, index, Count); } /// @@ -244,7 +244,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic /// public virtual string ToTypeString() { - return string.Format("{0} {1}-{2}", GetType().Name, Count, typeof(T).Name); + return string.Format("{0} {1}-{2}", GetType().Name, Count, typeof (T).Name); } /// diff --git a/src/Numerics/LinearAlgebra/Generic/Vector.Operators.cs b/src/Numerics/LinearAlgebra/Vector.Operators.cs similarity index 99% rename from src/Numerics/LinearAlgebra/Generic/Vector.Operators.cs rename to src/Numerics/LinearAlgebra/Vector.Operators.cs index 701aa422..7ef041d1 100644 --- a/src/Numerics/LinearAlgebra/Generic/Vector.Operators.cs +++ b/src/Numerics/LinearAlgebra/Vector.Operators.cs @@ -31,7 +31,7 @@ using System; using System.Runtime.CompilerServices; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { public abstract partial class Vector { diff --git a/src/Numerics/LinearAlgebra/Generic/Vector.cs b/src/Numerics/LinearAlgebra/Vector.cs similarity index 98% rename from src/Numerics/LinearAlgebra/Generic/Vector.cs rename to src/Numerics/LinearAlgebra/Vector.cs index b610fc62..eb1335ab 100644 --- a/src/Numerics/LinearAlgebra/Generic/Vector.cs +++ b/src/Numerics/LinearAlgebra/Vector.cs @@ -35,7 +35,7 @@ using System.Runtime; using MathNet.Numerics.LinearAlgebra.Storage; using MathNet.Numerics.Properties; -namespace MathNet.Numerics.LinearAlgebra.Generic +namespace MathNet.Numerics.LinearAlgebra { /// /// Defines the generic class for Vector classes. @@ -52,12 +52,12 @@ namespace MathNet.Numerics.LinearAlgebra.Generic /// /// The zero value for type T. /// - private static readonly T Zero = Common.ZeroOf(); + static readonly T Zero = Common.ZeroOf(); /// /// The value of 1.0 for type T. /// - private static readonly T One = Common.OneOf(); + static readonly T One = Common.OneOf(); /// /// Initializes a new instance of the Vector class. @@ -91,7 +91,7 @@ namespace MathNet.Numerics.LinearAlgebra.Generic [TargetedPatchingOptOut("Performance critical to inline across NGen image boundaries")] //[MethodImpl(MethodImplOptions.AggressiveInlining)] .Net 4.5 only - set { Storage[index] = value;} + set { Storage[index] = value; } } /// Gets the value at the given without range checking.. diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index df5ef4b6..bcfaa6bc 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -108,11 +108,11 @@ - - - - - + + + + + @@ -206,7 +206,7 @@ - + @@ -268,8 +268,8 @@ - - + + @@ -315,20 +315,20 @@ - + - - - + + + - + @@ -342,23 +342,23 @@ Code - - - - - - - - + + + + + + + + - + - - - + + + diff --git a/src/Numerics/RootFinding/Broyden.cs b/src/Numerics/RootFinding/Broyden.cs index ee62255a..1570224c 100644 --- a/src/Numerics/RootFinding/Broyden.cs +++ b/src/Numerics/RootFinding/Broyden.cs @@ -28,10 +28,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; using MathNet.Numerics.LinearAlgebra.Double; -using MathNet.Numerics.LinearAlgebra.Generic; -using System; using MathNet.Numerics.Properties; +using System; namespace MathNet.Numerics.RootFinding { diff --git a/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs index 3acecbea..fa30de56 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs @@ -28,16 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Complex { - using Algorithms.LinearAlgebra; - using Distributions; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - using System; - using System.Collections.Generic; using System.Numerics; /// diff --git a/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs index 97eda0fd..848b2d0d 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs @@ -28,17 +28,18 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Complex32 { - using Algorithms.LinearAlgebra; - using Distributions; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using LinearAlgebra.Generic.Factorization; using Numerics; - using NUnit.Framework; - using System; - using System.Collections.Generic; /// /// Base class for linear algebra provider tests. diff --git a/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs index a6c46a71..0a7c4034 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs @@ -28,17 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Double { - using Algorithms.LinearAlgebra; - using Distributions; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - using System; - using System.Collections.Generic; - /// /// Base class for linear algebra provider tests. /// diff --git a/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs index 2ca1c506..6da77fc1 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs @@ -28,17 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Algorithms.LinearAlgebra; +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.LinearAlgebra.Single; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Single { - using Algorithms.LinearAlgebra; - using Distributions; - using LinearAlgebra.Generic; - using LinearAlgebra.Generic.Factorization; - using LinearAlgebra.Single; - using NUnit.Framework; - using System; - using System.Collections.Generic; - /// /// Base class for linear algebra provider tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs index 1129997c..c2fef366 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs @@ -30,10 +30,10 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; + using LinearAlgebra; using LinearAlgebra.Complex; - using LinearAlgebra.Generic; using NUnit.Framework; + using System.Numerics; [TestFixture] public class DenseVectorArithmeticTheory : VectorArithmeticTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs index 6bdf2ed0..b72f21db 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System; - using System.Collections.Generic; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using NUnit.Framework; /// /// Dense vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs index 8d161efa..7ebdf018 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs @@ -24,13 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; /// /// Cholesky factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs index abad3099..42cee967 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; /// /// GramSchmidt factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs index 1657b60b..b6e8cce7 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs @@ -24,13 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; /// /// LU factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs index 505f1dce..9caabb72 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs @@ -24,14 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; /// /// QR factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs index fd9c761f..b154b226 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; /// /// Svd factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs index f1e1d399..91368c87 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs @@ -24,15 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Factorization; - using NUnit.Framework; /// /// QR factorization tests for a user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs b/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs index ebf817db..49771454 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs @@ -28,15 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Collections.Generic; using System.Numerics; - using Distributions; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using Numerics.Random; - using NUnit.Framework; /// /// Base class for matrix tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs index e63585ab..819e5112 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Linq; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using Distributions; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using Numerics.Random; - using NUnit.Framework; - using System.Linq; using System.Numerics; [TestFixture] diff --git a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs index 1d848d1c..be9012c1 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs @@ -24,14 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System; using System.Numerics; - using Distributions; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using NUnit.Framework; /// /// Abstract class with the common set of matrix tests diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs index 27555aca..69ec91d9 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs @@ -28,16 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers; - using LinearAlgebra.Complex.Solvers.Iterative; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; /// /// Tests of Bi-Conjugate Gradient stabilized iterative matrix solver. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs index 9dd1f7a5..bd0b63a4 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers; - using LinearAlgebra.Complex.Solvers.Iterative; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests for Generalized Product Bi-Conjugate Gradient iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs index db59e9bb..b54aebb2 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers; - using LinearAlgebra.Complex.Solvers.Iterative; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests for Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs index 329c0461..403a8f46 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers; - using LinearAlgebra.Complex.Solvers.Iterative; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests of Transpose Free Quasi-Minimal Residual iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs index f0412326..54dfb425 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers { - using System; - using System.Collections.Generic; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Iterator tests /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs index 9c498b9e..6ee93e79 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs @@ -24,13 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.Preconditioners; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Preconditioners { using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers.Preconditioners; - using LinearAlgebra.Generic; - using NUnit.Framework; /// /// Test for element sort algorithm of Ilupt class. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs index 082b2b69..bf5eda77 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; /// /// Divergence stop criterium test. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs index 6e20d54c..f988b800 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using System; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; /// /// Failure stop criterium tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs index a6d24151..cb2f4983 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Iteration count stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs index ebf36862..820d8ef4 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Complex.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; /// /// Residual stop criterium tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs index 0cbc81c8..a46b0c83 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs @@ -28,12 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using NUnit.Framework; [TestFixture] public class SparseVectorArithmeticTheory : VectorArithmeticTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs index c17ffbd1..37cdf746 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs @@ -28,15 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Storage; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System; - using System.Collections.Generic; using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using LinearAlgebra.Storage; - using NUnit.Framework; /// /// Sparse vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs index de9f71bb..14c12708 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs @@ -24,14 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using System; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; using MathNet.Numerics.LinearAlgebra.Storage; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; /// /// User-defined matrix implementation (internal class for testing purposes) diff --git a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs index c168d1e3..23e88fe6 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs @@ -24,12 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using MathNet.Numerics.LinearAlgebra.Storage; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { using System.Numerics; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using LinearAlgebra.Storage; /// /// User-defined vector implementation (internal class for testing purposes) diff --git a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs index b7c0cee7..f1e9f62e 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs @@ -24,12 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Collections.Generic; using System.Numerics; - using LinearAlgebra.Generic; - using NUnit.Framework; /// /// Test class for user-defined vector. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs index 4ad88c78..cde0aad5 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs @@ -24,12 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System; using System.Numerics; - using LinearAlgebra.Generic; - using NUnit.Framework; /// /// Abstract class with the common arithmetic set of vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs index 85e695d5..f62df2ea 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs @@ -28,16 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using NUnit.Framework; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using Distributions; - using LinearAlgebra.Complex; - using LinearAlgebra.Generic; - using NUnit.Framework; - using System; - using System.Collections; - using System.Collections.Generic; - using System.Linq; using System.Numerics; /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorArithmeticTheory.cs index 0974f36f..0ca81bc3 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorArithmeticTheory.cs @@ -28,12 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; using Numerics; - using NUnit.Framework; [TestFixture] public class DenseVectorArithmeticTheory : VectorArithmeticTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs index d08a4e4e..b8340c2a 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/DenseVectorTests.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using System; - using System.Collections.Generic; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Dense vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/CholeskyTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/CholeskyTests.cs index 870d1c17..c9c630ed 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/CholeskyTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/CholeskyTests.cs @@ -24,13 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Cholesky factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/GramSchmidtTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/GramSchmidtTests.cs index d48c4122..13686f65 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/GramSchmidtTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/GramSchmidtTests.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// GramSchmidt factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/LUTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/LUTests.cs index cf38c4aa..0c3c622c 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/LUTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/LUTests.cs @@ -24,13 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// LU factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/QRTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/QRTests.cs index 5387d77d..17646698 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/QRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/QRTests.cs @@ -24,14 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// QR factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/SvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/SvdTests.cs index 188d1a29..b6566e2e 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/SvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/SvdTests.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Svd factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserQRTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserQRTests.cs index ecff2b28..b501db43 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserQRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserQRTests.cs @@ -24,15 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Factorization; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// QR factorization tests for a user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixLoader.cs b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixLoader.cs index 868246ba..254aee61 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixLoader.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixLoader.cs @@ -28,15 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using System.Collections.Generic; - using Distributions; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using Numerics.Random; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Base class for matrix tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixStructureTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixStructureTheory.cs index de6c54fe..28fa7e72 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixStructureTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixStructureTheory.cs @@ -28,15 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Linq; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using Distributions; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using Numerics.Random; - using NUnit.Framework; - using System.Linq; - using Complex32 = Numerics.Complex32; + using Numerics; [TestFixture] public class MatrixStructureTheory : MatrixStructureTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.Arithmetic.cs index 0080f507..fdef2f4f 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/MatrixTests.Arithmetic.cs @@ -24,14 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using System; - using Distributions; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Abstract class with the common set of matrix tests diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs index b7f21ee7..3489aaaa 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/BiCgStabTest.cs @@ -28,16 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterative { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers; - using LinearAlgebra.Complex32.Solvers.Iterative; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Tests of Bi-Conjugate Gradient stabilized iterative matrix solver. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs index 49daf606..f274e35f 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/GpBiCgTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterative { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers; - using LinearAlgebra.Complex32.Solvers.Iterative; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests for Generalized Product Bi-Conjugate Gradient iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs index fa8c00bf..e5fcfe83 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/MlkBiCgStabTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterative { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers; - using LinearAlgebra.Complex32.Solvers.Iterative; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests for Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs index 7f300604..d5227ba3 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/Iterative/TFQMRTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.Iterative { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers; - using LinearAlgebra.Complex32.Solvers.Iterative; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests of Transpose Free Quasi-Minimal Residual iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs index 1db7adfb..838c8919 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/IteratorTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers { - using System; - using System.Collections.Generic; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Iterator tests /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs index 49dbffb3..94be71cf 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCriterium { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Divergence stop criterium test. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs index 3990904d..e36ab8ef 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCriterium { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Failure stop criterium tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs index 8a965f9d..3abb0def 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCriterium { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Iteration count stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/ResidualStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/ResidualStopCriteriumTest.cs index f2fe7f6d..044de11d 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/ResidualStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Solvers/StopCriterium/ResidualStopCriteriumTest.cs @@ -28,14 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Solvers.StopCriterium { - using System; - using LinearAlgebra.Complex32; - using LinearAlgebra.Complex32.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Residual stop criterium tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorArithmeticTheory.cs index ee5e9a1c..71e765d5 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorArithmeticTheory.cs @@ -28,12 +28,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; using Numerics; - using NUnit.Framework; [TestFixture] public class SparseVectorArithmeticTheory : VectorArithmeticTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs index f8cd256a..b6516615 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/SparseVectorTest.cs @@ -28,15 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Storage; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using System; - using System.Collections.Generic; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using LinearAlgebra.Storage; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Sparse vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrix.cs b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrix.cs index f3ac48cd..a79deb1a 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrix.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedMatrix.cs @@ -24,14 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using System; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; using MathNet.Numerics.LinearAlgebra.Storage; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// User-defined matrix implementation (internal class for testing purposes) diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVector.cs b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVector.cs index f405ea1f..0d8e8e8c 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVector.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVector.cs @@ -24,12 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Storage; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using LinearAlgebra.Storage; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// User-defined vector implementation (internal class for testing purposes) diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVectorTests.cs index 87b388df..c83ef77a 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/UserDefinedVectorTests.cs @@ -24,12 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using System.Collections.Generic; - using LinearAlgebra.Generic; - using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Test class for user-defined vector. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.Arithmetic.cs index aa3ce429..e1aac74d 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.Arithmetic.cs @@ -24,11 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using System; - using LinearAlgebra.Generic; - using NUnit.Framework; using Complex32 = Numerics.Complex32; /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.cs index 548a58b1..8d5e55f8 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/VectorTests.cs @@ -28,17 +28,18 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex32; +using NUnit.Framework; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32 { - using Distributions; - using LinearAlgebra.Complex32; - using LinearAlgebra.Generic; - using NUnit.Framework; - using System; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - using Complex32 = Numerics.Complex32; + using Numerics; /// /// Abstract class with the common set of vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorArithmeticTheory.cs index 1831addf..acbf3802 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorArithmeticTheory.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using NUnit.Framework; - [TestFixture] public class DenseVectorArithmeticTheory : VectorArithmeticTheory { diff --git a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs index a6c2621e..e9405253 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/DenseVectorTests.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using System; - using System.Collections.Generic; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using NUnit.Framework; - /// /// Dense vector tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs index 1d4277d1..5dc77446 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/DiagonalMatrixTests.cs @@ -27,14 +27,15 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using NUnit.Framework; - using System; - using System.Collections.Generic; - /// /// Diagonal matrix tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/GramSchmidtTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/GramSchmidtTests.cs index f66d9e20..7a19609b 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/GramSchmidtTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/GramSchmidtTests.cs @@ -24,14 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - /// /// GramSchmidt factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/LUTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/LUTests.cs index 2a9e7085..277ba373 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/LUTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/LUTests.cs @@ -24,13 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - /// /// LU factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/QRTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/QRTests.cs index cb44e96c..2a9c3523 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/QRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/QRTests.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - /// /// QR factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/SvdTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/SvdTests.cs index cc223645..93371c28 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/SvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/SvdTests.cs @@ -24,14 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Factorization; - using LinearAlgebra.Generic.Factorization; - using NUnit.Framework; - /// /// Svd factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserQRTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserQRTests.cs index c59039eb..4e589876 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserQRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserQRTests.cs @@ -24,15 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using NUnit.Framework; +using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Factorization; - using NUnit.Framework; - /// /// QR factorization tests for a user matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/MatrixLoader.cs b/src/UnitTests/LinearAlgebraTests/Double/MatrixLoader.cs index fee08ac8..f4a5f052 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/MatrixLoader.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/MatrixLoader.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using System.Collections.Generic; - using Distributions; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using Numerics.Random; - using NUnit.Framework; - /// /// Base class for matrix tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/MatrixStructureTheory.cs b/src/UnitTests/LinearAlgebraTests/Double/MatrixStructureTheory.cs index d1e1dd31..67d6cb14 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/MatrixStructureTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/MatrixStructureTheory.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Linq; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using Distributions; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using Numerics.Random; - using NUnit.Framework; - using System.Linq; - [TestFixture] public class MatrixStructureTheory : MatrixStructureTheory { diff --git a/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs index bf1f6e91..274baa43 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using System; - using Distributions; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using NUnit.Framework; - /// /// Abstract class with the common set of matrix tests /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs index 4bfdee5a..3d2c9135 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/BiCgStabTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers; - using LinearAlgebra.Double.Solvers.Iterative; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests of Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs index 68409e98..8b2aeda4 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/GpBiCgTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers; - using LinearAlgebra.Double.Solvers.Iterative; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests for Generalized Product Bi-Conjugate Gradient iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs index 3b598173..00d6b8d4 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/MlkBiCgStabTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers; - using LinearAlgebra.Double.Solvers.Iterative; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests for Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs index 98c54a73..ba9f933c 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/Iterative/TFQMRTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.Iterative { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers; - using LinearAlgebra.Double.Solvers.Iterative; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Tests of Transpose Free Quasi-Minimal Residual iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs index e4d27a37..bad123f8 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/IteratorTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers { - using System; - using System.Collections.Generic; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Iterator tests /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs index 5280272f..5a4a37d0 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCriterium { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Divergence stop criterium test. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs index 35e91d27..47cc6fbf 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCriterium { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Failure stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs index 064789b9..84a7d568 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCriterium { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Iteration count stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/ResidualStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/ResidualStopCriteriumTest.cs index cb889c83..eb3831f6 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/ResidualStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Solvers/StopCriterium/ResidualStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Solvers.StopCriterium { - using System; - using LinearAlgebra.Double; - using LinearAlgebra.Double.Solvers.StopCriterium; - using LinearAlgebra.Generic.Solvers.Status; - using NUnit.Framework; - /// /// Residual stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorArithmeticTheory.cs index ccec998b..b4da1c61 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorArithmeticTheory.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using NUnit.Framework; - [TestFixture] public class SparseVectorArithmeticTheory : VectorArithmeticTheory { diff --git a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs index 10e1de3d..1a4f9c45 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/SparseVectorTest.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Storage; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using System; - using System.Collections.Generic; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using LinearAlgebra.Storage; - using NUnit.Framework; - /// /// Sparse vector tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrix.cs b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrix.cs index b93b4c43..8f976b88 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrix.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedMatrix.cs @@ -24,14 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using System; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; using MathNet.Numerics.LinearAlgebra.Storage; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - /// /// User-defined matrix implementation (internal class for testing purposes) /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVector.cs b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVector.cs index ace40e08..679d4fdb 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVector.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVector.cs @@ -24,12 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using MathNet.Numerics.LinearAlgebra.Storage; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using LinearAlgebra.Storage; - /// /// User-defined vector implementation (internal class for testing purposes) /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVectorTests.cs index e222705a..ed464280 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/UserDefinedVectorTests.cs @@ -24,12 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using System.Collections.Generic; - using LinearAlgebra.Generic; - using NUnit.Framework; - /// /// Test class for user-defined vector. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/VectorTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Double/VectorTests.Arithmetic.cs index a7d10265..8c1f344c 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/VectorTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/VectorTests.Arithmetic.cs @@ -24,12 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using System; - using LinearAlgebra.Generic; - using NUnit.Framework; - /// /// Abstract class with the common arithmetic set of vector tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Double/VectorTests.cs b/src/UnitTests/LinearAlgebraTests/Double/VectorTests.cs index 70517810..27fa7c9a 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/VectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/VectorTests.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Double; +using NUnit.Framework; +using System; +using System.Collections; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double { - using Distributions; - using LinearAlgebra.Double; - using LinearAlgebra.Generic; - using NUnit.Framework; - using System; - using System.Collections; - using System.Collections.Generic; - /// /// Abstract class with the common set of vector tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Access.cs b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Access.cs index d027f335..53e6131f 100644 --- a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Access.cs +++ b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Access.cs @@ -1,6 +1,36 @@ -using System; -using MathNet.Numerics.LinearAlgebra.Generic; +// +// 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-2013 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 MathNet.Numerics.LinearAlgebra; using NUnit.Framework; +using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests { diff --git a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Reform.cs b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Reform.cs index c33765e4..09a237af 100644 --- a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Reform.cs +++ b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.Reform.cs @@ -1,7 +1,37 @@ -using System; -using System.Linq; -using MathNet.Numerics.LinearAlgebra.Generic; +// +// 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-2013 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 MathNet.Numerics.LinearAlgebra; using NUnit.Framework; +using System; +using System.Linq; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests { diff --git a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs index 3454d9bb..2dc611c3 100644 --- a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs @@ -28,14 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using System.Collections.Generic; +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests { - using System; - using LinearAlgebra.Generic; - using NUnit.Framework; - [TestFixture] public abstract partial class MatrixStructureTheory where T : struct, IEquatable, IFormattable diff --git a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorArithmeticTheory.cs index 72256c52..e6990db4 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorArithmeticTheory.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Single; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using LinearAlgebra.Generic; - using LinearAlgebra.Single; - using NUnit.Framework; - [TestFixture] public class DenseVectorArithmeticTheory : VectorArithmeticTheory { diff --git a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs index 77d289a3..9b407d36 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/DenseVectorTests.cs @@ -30,11 +30,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using System; - using System.Collections.Generic; - using LinearAlgebra.Generic; + using LinearAlgebra; using LinearAlgebra.Single; using NUnit.Framework; + using System; + using System.Collections.Generic; /// /// Dense vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/CholeskyTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/CholeskyTests.cs index 54971d5d..20895a69 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/CholeskyTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/CholeskyTests.cs @@ -24,13 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System; - using LinearAlgebra.Generic.Factorization; - using LinearAlgebra.Single; - using NUnit.Framework; - /// /// Cholesky factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/GramSchmidtTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/GramSchmidtTests.cs index a114940d..dc1cb771 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/GramSchmidtTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/GramSchmidtTests.cs @@ -24,14 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System; - using LinearAlgebra.Generic.Factorization; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Factorization; - using NUnit.Framework; - /// /// GramSchmidt factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/LUTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/LUTests.cs index 020df06f..0837039e 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/LUTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/LUTests.cs @@ -24,13 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System; - using LinearAlgebra.Generic.Factorization; - using LinearAlgebra.Single; - using NUnit.Framework; - /// /// LU factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/QRTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/QRTests.cs index 67dd3448..4e359900 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/QRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/QRTests.cs @@ -24,14 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System; - using LinearAlgebra.Generic.Factorization; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Factorization; - using NUnit.Framework; - /// /// QR factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/SvdTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/SvdTests.cs index e430848d..29c4070c 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/SvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/SvdTests.cs @@ -24,14 +24,13 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Factorization; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System; - using LinearAlgebra.Generic.Factorization; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Factorization; - using NUnit.Framework; - /// /// Svd factorization tests for a dense matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserQRTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserQRTests.cs index b418829b..2d70eed5 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserQRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserQRTests.cs @@ -24,15 +24,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Factorization; +using NUnit.Framework; +using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Factorization; - using NUnit.Framework; - /// /// QR factorization tests for a user matrix. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/MatrixLoader.cs b/src/UnitTests/LinearAlgebraTests/Single/MatrixLoader.cs index 53e4a49b..064d8290 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/MatrixLoader.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/MatrixLoader.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using System.Collections.Generic; - using Distributions; - using LinearAlgebra.Generic; - using LinearAlgebra.Single; - using Numerics.Random; - using NUnit.Framework; - /// /// Base class for matrix tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/MatrixStructureTheory.cs b/src/UnitTests/LinearAlgebraTests/Single/MatrixStructureTheory.cs index 800d5cb7..3ca2e0b1 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/MatrixStructureTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/MatrixStructureTheory.cs @@ -28,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.Random; +using NUnit.Framework; +using System.Linq; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using Distributions; - using LinearAlgebra.Generic; - using LinearAlgebra.Single; - using Numerics.Random; - using NUnit.Framework; - using System.Linq; - [TestFixture] public class MatrixStructureTheory : MatrixStructureTheory { diff --git a/src/UnitTests/LinearAlgebraTests/Single/MatrixTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Single/MatrixTests.Arithmetic.cs index c115908e..845512c9 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/MatrixTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/MatrixTests.Arithmetic.cs @@ -26,11 +26,11 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using System; using Distributions; - using LinearAlgebra.Generic; + using LinearAlgebra; using LinearAlgebra.Single; using NUnit.Framework; + using System; /// /// Abstract class with the common set of matrix tests diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs index 05e8c9f5..9f22d060 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/BiCgStabTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers; - using LinearAlgebra.Single.Solvers.Iterative; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Tests of Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs index c185ae01..e04be57f 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/GpBiCgTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers; - using LinearAlgebra.Single.Solvers.Iterative; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Tests for Generalized Product Bi-Conjugate Gradient iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs index c12211f2..4e9d8f3b 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/MlkBiCgStabTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers; - using LinearAlgebra.Single.Solvers.Iterative; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Tests for Multiple-Lanczos Bi-Conjugate Gradient stabilized iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs index f47ab16b..da4185ca 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/Iterative/TFQMRTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.Iterative { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers; - using LinearAlgebra.Single.Solvers.Iterative; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Tests of Transpose Free Quasi-Minimal Residual iterative matrix solver. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs index 3d9c9e9f..0408fff7 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/IteratorTest.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers { - using System; - using System.Collections.Generic; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Iterator tests /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs index 19cd737e..d76b008c 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCriterium { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Divergence stop criterium test. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs index 2832f6ed..a42afbd6 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCriterium { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Failure stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs index 1a33e953..a36319e5 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCriterium { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Iteration count stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/ResidualStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/ResidualStopCriteriumTest.cs index 0deec0bb..a39c4193 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/ResidualStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Solvers/StopCriterium/ResidualStopCriteriumTest.cs @@ -28,14 +28,14 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium; +using MathNet.Numerics.LinearAlgebra.Solvers.Status; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Solvers.StopCriterium { - using System; - using LinearAlgebra.Generic.Solvers.Status; - using LinearAlgebra.Single; - using LinearAlgebra.Single.Solvers.StopCriterium; - using NUnit.Framework; - /// /// Residual stop criterium tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorArithmeticTheory.cs index b5b62543..27929392 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorArithmeticTheory.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Single; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using LinearAlgebra.Generic; - using LinearAlgebra.Single; - using NUnit.Framework; - [TestFixture] public class SparseVectorArithmeticTheory : VectorArithmeticTheory { diff --git a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs index 5e3ec4c2..f5d32321 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/SparseVectorTest.cs @@ -30,13 +30,12 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using System; - using System.Collections.Generic; - using LinearAlgebra.Generic; + using LinearAlgebra; using LinearAlgebra.Single; using LinearAlgebra.Storage; using NUnit.Framework; - using Complex32 = Numerics.Complex32; + using System; + using System.Collections.Generic; /// /// Sparse vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrix.cs b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrix.cs index 583ae21b..f8d8ee14 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrix.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedMatrix.cs @@ -24,14 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using System; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Single; using MathNet.Numerics.LinearAlgebra.Storage; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using LinearAlgebra.Generic; - using LinearAlgebra.Single; - /// /// User-defined matrix implementation (internal class for testing purposes) /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVector.cs b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVector.cs index 6700b4a2..a49c9b0b 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVector.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVector.cs @@ -24,12 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Single; +using MathNet.Numerics.LinearAlgebra.Storage; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using LinearAlgebra.Generic; - using LinearAlgebra.Single; - using LinearAlgebra.Storage; - /// /// User-defined vector implementation (internal class for testing purposes) /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVectorTests.cs index 634e1d67..7ca5a0e3 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/UserDefinedVectorTests.cs @@ -24,12 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using System.Collections.Generic; - using LinearAlgebra.Generic; - using NUnit.Framework; - /// /// Test class for user-defined vector. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/VectorTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Single/VectorTests.Arithmetic.cs index 86b71d7a..a36a326c 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/VectorTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/VectorTests.Arithmetic.cs @@ -24,12 +24,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using System; - using LinearAlgebra.Generic; - using NUnit.Framework; - /// /// Abstract class with the common arithmetic set of vector tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/Single/VectorTests.cs b/src/UnitTests/LinearAlgebraTests/Single/VectorTests.cs index 37469d0b..fa1e76d5 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/VectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/VectorTests.cs @@ -28,16 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Distributions; +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Single; +using NUnit.Framework; +using System; +using System.Collections; +using System.Collections.Generic; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single { - using Distributions; - using LinearAlgebra.Generic; - using LinearAlgebra.Single; - using NUnit.Framework; - using System; - using System.Collections; - using System.Collections.Generic; - /// /// Abstract class with the common set of vector tests. /// diff --git a/src/UnitTests/LinearAlgebraTests/VectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/VectorArithmeticTheory.cs index 9681dbab..ea3d90de 100644 --- a/src/UnitTests/LinearAlgebraTests/VectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/VectorArithmeticTheory.cs @@ -28,12 +28,12 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using NUnit.Framework; +using System; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests { - using System; - using LinearAlgebra.Generic; - using NUnit.Framework; - [TestFixture] public abstract class VectorArithmeticTheory where T : struct, IEquatable, IFormattable diff --git a/src/UnitTests/MatrixHelpers.cs b/src/UnitTests/MatrixHelpers.cs index 4ade8991..35f2501b 100644 --- a/src/UnitTests/MatrixHelpers.cs +++ b/src/UnitTests/MatrixHelpers.cs @@ -23,9 +23,10 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // + +using MathNet.Numerics.LinearAlgebra; using System; using System.Numerics; -using MathNet.Numerics.LinearAlgebra.Generic; namespace MathNet.Numerics.UnitTests {