diff --git a/src/Numerics/Control.cs b/src/Numerics/Control.cs index 9f3a11c9..abfae9af 100644 --- a/src/Numerics/Control.cs +++ b/src/Numerics/Control.cs @@ -28,11 +28,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.Providers.LinearAlgebra; +using System; + namespace MathNet.Numerics { - using Algorithms.LinearAlgebra; - using System; - /// /// Sets parameters for the library. /// @@ -74,7 +74,7 @@ namespace MathNet.Numerics switch (value != null ? value.ToUpperInvariant() : string.Empty) { case "MKL": - LinearAlgebraProvider = new Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); + LinearAlgebraProvider = new Providers.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); break; default: LinearAlgebraProvider = new ManagedLinearAlgebraProvider(); diff --git a/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs index 28d353f7..4fc9e4ec 100644 --- a/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex/DenseMatrix.cs @@ -28,10 +28,10 @@ // 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.Providers.LinearAlgebra; using MathNet.Numerics.Threading; using System; using System.Collections.Generic; @@ -389,8 +389,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, @@ -420,8 +420,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, @@ -451,8 +451,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, 1.0, _values, _rowCount, @@ -482,8 +482,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, @@ -513,8 +513,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, diff --git a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs index a3c4d78a..afa05670 100644 --- a/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex/Factorization/DenseGramSchmidt.cs @@ -31,6 +31,7 @@ using MathNet.Numerics.LinearAlgebra.Factorization; using MathNet.Numerics.Properties; using System; +using MathNet.Numerics.Providers.LinearAlgebra; namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization { @@ -53,7 +54,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Factorization /// /// used for QR solve /// - private readonly Algorithms.LinearAlgebra.ILinearAlgebraProvider _provider = new Algorithms.LinearAlgebra.ManagedLinearAlgebraProvider(); + private readonly ILinearAlgebraProvider _provider = new ManagedLinearAlgebraProvider(); /// /// Initializes a new instance of the class. This object creates an unitary matrix diff --git a/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs index e178745a..540964a5 100644 --- a/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Complex32/DenseMatrix.cs @@ -28,10 +28,10 @@ // 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.Providers.LinearAlgebra; using MathNet.Numerics.Threading; using System; using System.Collections.Generic; @@ -384,8 +384,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, @@ -415,8 +415,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, @@ -446,8 +446,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, 1.0f, _values, _rowCount, @@ -477,8 +477,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, @@ -508,8 +508,8 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32 else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, diff --git a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs index 36fc85fa..8fd318cb 100644 --- a/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Complex32/Factorization/DenseGramSchmidt.cs @@ -31,6 +31,7 @@ using MathNet.Numerics.LinearAlgebra.Factorization; using MathNet.Numerics.Properties; using System; +using MathNet.Numerics.Providers.LinearAlgebra; namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization { @@ -48,7 +49,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Factorization /// /// used for QR solve /// - private readonly Algorithms.LinearAlgebra.ILinearAlgebraProvider _provider = new Algorithms.LinearAlgebra.ManagedLinearAlgebraProvider(); + private readonly ILinearAlgebraProvider _provider = new ManagedLinearAlgebraProvider(); /// /// Initializes a new instance of the class. This object creates an unitary matrix diff --git a/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs index 4a17e45e..4fe6c565 100644 --- a/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Double/DenseMatrix.cs @@ -28,10 +28,10 @@ // 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.Providers.LinearAlgebra; using MathNet.Numerics.Threading; using System; using System.Collections.Generic; @@ -470,8 +470,8 @@ namespace MathNet.Numerics.LinearAlgebra.Double else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, @@ -501,8 +501,8 @@ namespace MathNet.Numerics.LinearAlgebra.Double else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, @@ -532,8 +532,8 @@ namespace MathNet.Numerics.LinearAlgebra.Double else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, 1.0, _values, _rowCount, @@ -563,8 +563,8 @@ namespace MathNet.Numerics.LinearAlgebra.Double else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, @@ -594,8 +594,8 @@ namespace MathNet.Numerics.LinearAlgebra.Double else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0, _values, _rowCount, diff --git a/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs index 265712bd..47da0b29 100644 --- a/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Double/Factorization/DenseGramSchmidt.cs @@ -31,6 +31,7 @@ using MathNet.Numerics.LinearAlgebra.Factorization; using MathNet.Numerics.Properties; using System; +using MathNet.Numerics.Providers.LinearAlgebra; namespace MathNet.Numerics.LinearAlgebra.Double.Factorization { @@ -46,7 +47,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Factorization /// /// used for QR solve /// - private readonly Algorithms.LinearAlgebra.ILinearAlgebraProvider _provider = new Algorithms.LinearAlgebra.ManagedLinearAlgebraProvider(); + private readonly ILinearAlgebraProvider _provider = new ManagedLinearAlgebraProvider(); /// /// Initializes a new instance of the class. This object creates an orthogonal matrix diff --git a/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs b/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs index 5b64d1ab..179a8954 100644 --- a/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs +++ b/src/Numerics/LinearAlgebra/Single/DenseMatrix.cs @@ -28,10 +28,10 @@ // 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.Providers.LinearAlgebra; using MathNet.Numerics.Threading; using System; using System.Collections.Generic; @@ -470,8 +470,8 @@ namespace MathNet.Numerics.LinearAlgebra.Single else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, @@ -501,8 +501,8 @@ namespace MathNet.Numerics.LinearAlgebra.Single else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, @@ -532,8 +532,8 @@ namespace MathNet.Numerics.LinearAlgebra.Single else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.DontTranspose, - Algorithms.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, 1.0f, _values, _rowCount, @@ -563,8 +563,8 @@ namespace MathNet.Numerics.LinearAlgebra.Single else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, @@ -594,8 +594,8 @@ namespace MathNet.Numerics.LinearAlgebra.Single else { Control.LinearAlgebraProvider.MatrixMultiplyWithUpdate( - Algorithms.LinearAlgebra.Transpose.Transpose, - Algorithms.LinearAlgebra.Transpose.DontTranspose, + Providers.LinearAlgebra.Transpose.Transpose, + Providers.LinearAlgebra.Transpose.DontTranspose, 1.0f, _values, _rowCount, diff --git a/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs b/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs index 336a42b8..f8780765 100644 --- a/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs +++ b/src/Numerics/LinearAlgebra/Single/Factorization/DenseGramSchmidt.cs @@ -31,6 +31,7 @@ using MathNet.Numerics.LinearAlgebra.Factorization; using MathNet.Numerics.Properties; using System; +using MathNet.Numerics.Providers.LinearAlgebra; namespace MathNet.Numerics.LinearAlgebra.Single.Factorization { @@ -46,7 +47,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Factorization /// /// used for QR solve /// - private readonly Algorithms.LinearAlgebra.ILinearAlgebraProvider _provider = new Algorithms.LinearAlgebra.ManagedLinearAlgebraProvider(); + private readonly ILinearAlgebraProvider _provider = new ManagedLinearAlgebraProvider(); /// /// Initializes a new instance of the class. This object creates an orthogonal matrix diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index e23755f8..95e2d318 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -86,18 +86,29 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex.cs b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex.cs rename to src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex.cs index 1d4d3132..82745147 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex.cs +++ b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex.cs @@ -26,9 +26,9 @@ #if NATIVEACML -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Acml +namespace MathNet.Numerics.Providers.LinearAlgebra.Acml { using System; using System.Numerics; diff --git a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex32.cs b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex32.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex32.cs rename to src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex32.cs index 815bf007..1ca1b70b 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex32.cs +++ b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.Complex32.cs @@ -30,9 +30,9 @@ #if NATIVEACML -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Acml +namespace MathNet.Numerics.Providers.LinearAlgebra.Acml { using System; using System.Security; diff --git a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.double.cs b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.double.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.double.cs rename to src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.double.cs index b8712326..f656ce52 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.double.cs +++ b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.double.cs @@ -30,9 +30,9 @@ #if NATIVEACML -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Acml +namespace MathNet.Numerics.Providers.LinearAlgebra.Acml { using System; using System.Security; diff --git a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.float.cs b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.float.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.float.cs rename to src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.float.cs index bde76883..0f9f7186 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.float.cs +++ b/src/Numerics/Providers/LinearAlgebra/Acml/AcmlLinearAlgebraProvider.float.cs @@ -30,9 +30,9 @@ #if NATIVEACML -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Acml +namespace MathNet.Numerics.Providers.LinearAlgebra.Acml { using System; using System.Security; diff --git a/src/Numerics/Algorithms/LinearAlgebra/Acml/SafeNativeMethods.cs b/src/Numerics/Providers/LinearAlgebra/Acml/SafeNativeMethods.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Acml/SafeNativeMethods.cs rename to src/Numerics/Providers/LinearAlgebra/Acml/SafeNativeMethods.cs index 5a42a4be..aa05e495 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Acml/SafeNativeMethods.cs +++ b/src/Numerics/Providers/LinearAlgebra/Acml/SafeNativeMethods.cs @@ -32,7 +32,7 @@ using System.Numerics; using System.Runtime.InteropServices; using System.Security; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Acml +namespace MathNet.Numerics.Providers.LinearAlgebra.Acml { /// /// P/Invoke methods to the native math libraries. diff --git a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Common.cs b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Common.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Common.cs rename to src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Common.cs index de2afed2..4e31a85a 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Common.cs +++ b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Common.cs @@ -30,7 +30,7 @@ #if NATIVEGOTO -namespace MathNet.Numerics.Algorithms.LinearAlgebra.GotoBlas +namespace MathNet.Numerics.Providers.LinearAlgebra.GotoBlas { using System; using System.Numerics; diff --git a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex.cs b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex.cs rename to src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex.cs index 1215cb31..429672b5 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex.cs +++ b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex.cs @@ -30,9 +30,9 @@ #if NATIVEGOTO -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.GotoBlas +namespace MathNet.Numerics.Providers.LinearAlgebra.GotoBlas { using System; using System.Numerics; diff --git a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex32.cs b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex32.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex32.cs rename to src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex32.cs index 5ce0d7a9..c9deb438 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex32.cs +++ b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.Complex32.cs @@ -30,9 +30,9 @@ #if NATIVEGOTO -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.GotoBlas +namespace MathNet.Numerics.Providers.LinearAlgebra.GotoBlas { using System; using System.Security; diff --git a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.double.cs b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.double.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.double.cs rename to src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.double.cs index 60dcd005..b57583df 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.double.cs +++ b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.double.cs @@ -30,9 +30,9 @@ #if NATIVEGOTO -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.GotoBlas +namespace MathNet.Numerics.Providers.LinearAlgebra.GotoBlas { using System; using System.Security; diff --git a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.float.cs b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.float.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.float.cs rename to src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.float.cs index 6a938965..8f9038e6 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.float.cs +++ b/src/Numerics/Providers/LinearAlgebra/GotoBlas/GotoBlasLinearAlgebraProvider.float.cs @@ -30,9 +30,9 @@ #if NATIVEGOTO -using MathNet.Numerics.LinearAlgebra.Generic.Factorization; +using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.GotoBlas +namespace MathNet.Numerics.Providers.LinearAlgebra.GotoBlas { using System; using System.Security; diff --git a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/SafeNativeMethods.cs b/src/Numerics/Providers/LinearAlgebra/GotoBlas/SafeNativeMethods.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/GotoBlas/SafeNativeMethods.cs rename to src/Numerics/Providers/LinearAlgebra/GotoBlas/SafeNativeMethods.cs index 4176ec91..9426f5b7 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/GotoBlas/SafeNativeMethods.cs +++ b/src/Numerics/Providers/LinearAlgebra/GotoBlas/SafeNativeMethods.cs @@ -32,7 +32,7 @@ using System.Numerics; using System.Runtime.InteropServices; using System.Security; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.GotoBlas +namespace MathNet.Numerics.Providers.LinearAlgebra.GotoBlas { /// /// P/Invoke methods to the native math libraries. diff --git a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProvider.cs b/src/Numerics/Providers/LinearAlgebra/ILinearAlgebraProvider.cs similarity index 93% rename from src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProvider.cs rename to src/Numerics/Providers/LinearAlgebra/ILinearAlgebraProvider.cs index 27253391..cafb0070 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProvider.cs +++ b/src/Numerics/Providers/LinearAlgebra/ILinearAlgebraProvider.cs @@ -3,9 +3,9 @@ // 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 @@ -14,10 +14,10 @@ // 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 @@ -28,8 +28,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -// INITIAL DRAFT MISSING EXCEPTION SPECIFICATIONS -namespace MathNet.Numerics.Algorithms.LinearAlgebra +namespace MathNet.Numerics.Providers.LinearAlgebra { #if !NOSYSNUMERICS diff --git a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProviderOfT.cs b/src/Numerics/Providers/LinearAlgebra/ILinearAlgebraProviderOfT.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProviderOfT.cs rename to src/Numerics/Providers/LinearAlgebra/ILinearAlgebraProviderOfT.cs index ca951440..ce7e881a 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ILinearAlgebraProviderOfT.cs +++ b/src/Numerics/Providers/LinearAlgebra/ILinearAlgebraProviderOfT.cs @@ -3,7 +3,9 @@ // http://numerics.mathdotnet.com // http://github.com/mathnet/mathnet-numerics // http://mathnetnumerics.codeplex.com -// Copyright (c) 2009-2011 Math.NET +// +// 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 @@ -12,8 +14,10 @@ // 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 @@ -24,11 +28,9 @@ // OTHER DEALINGS IN THE SOFTWARE. // -// INITIAL DRAFT MISSING EXCEPTION SPECIFICATIONS - using MathNet.Numerics.LinearAlgebra.Factorization; -namespace MathNet.Numerics.Algorithms.LinearAlgebra +namespace MathNet.Numerics.Providers.LinearAlgebra { #if !NOSYSNUMERICS diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs rename to src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs index 5d92a5d5..c051ad82 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs +++ b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex.cs @@ -3,7 +3,9 @@ // 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 @@ -12,8 +14,10 @@ // 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 @@ -24,17 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex.Factorization; using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; -namespace MathNet.Numerics.Algorithms.LinearAlgebra +namespace MathNet.Numerics.Providers.LinearAlgebra { - using System; - using Properties; - using Threading; - using Numerics.LinearAlgebra.Complex.Factorization; -#if NOSYSNUMERICS - using Complex = Numerics.Complex; -#else + +#if !NOSYSNUMERICS using Complex = System.Numerics.Complex; #endif diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs rename to src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs index 2d270f34..f76465d1 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs +++ b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Complex32.cs @@ -3,7 +3,9 @@ // 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 @@ -12,8 +14,10 @@ // 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 @@ -24,15 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra.Complex32; +using MathNet.Numerics.LinearAlgebra.Complex32.Factorization; using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; -namespace MathNet.Numerics.Algorithms.LinearAlgebra +namespace MathNet.Numerics.Providers.LinearAlgebra { - using System; - using Properties; - using Threading; - using Numerics.LinearAlgebra.Complex32.Factorization; - using Numerics.LinearAlgebra.Complex32; #if !NOSYSNUMERICS using Complex = System.Numerics.Complex; diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs rename to src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs index 2f74b8b6..7c2a3390 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs +++ b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Double.cs @@ -3,7 +3,9 @@ // 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 @@ -12,8 +14,10 @@ // 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 @@ -25,12 +29,12 @@ // using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; -namespace MathNet.Numerics.Algorithms.LinearAlgebra +namespace MathNet.Numerics.Providers.LinearAlgebra { - using System; - using Properties; - using Threading; #if !NOSYSNUMERICS using Complex = System.Numerics.Complex; diff --git a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs rename to src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs index c4d97b29..bcb62187 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs +++ b/src/Numerics/Providers/LinearAlgebra/ManagedLinearAlgebraProvider.Single.cs @@ -3,7 +3,9 @@ // 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 @@ -12,8 +14,10 @@ // 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 @@ -25,12 +29,12 @@ // using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using MathNet.Numerics.Threading; +using System; -namespace MathNet.Numerics.Algorithms.LinearAlgebra +namespace MathNet.Numerics.Providers.LinearAlgebra { - using System; - using Properties; - using Threading; #if !NOSYSNUMERICS using Complex = System.Numerics.Complex; diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Common.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Common.cs similarity index 98% rename from src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Common.cs rename to src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Common.cs index 2b501330..75d979ae 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Common.cs +++ b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Common.cs @@ -30,13 +30,13 @@ #if NATIVEMKL -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl +using MathNet.Numerics.Properties; +using System; +using System.Numerics; +using System.Security; + +namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl { - using System; - using System.Numerics; - using System.Security; - using Properties; - /// /// Intel's Math Kernel Library (MKL) linear algebra provider. /// diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs rename to src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs index c1f30ff9..858a38e9 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs +++ b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex.cs @@ -31,14 +31,13 @@ #if NATIVEMKL using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Numerics; +using System.Security; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl +namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl { - using System; - using System.Numerics; - using System.Security; - using Properties; - /// /// Intel's Math Kernel Library (MKL) linear algebra provider. /// diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs rename to src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs index b5e317c6..ea051a08 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs +++ b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.Complex32.cs @@ -28,16 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Factorization; - #if NATIVEMKL -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl -{ - using System; - using System.Security; - using Properties; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Security; +namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl +{ /// /// Intel's Math Kernel Library (MKL) linear algebra provider. /// diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs rename to src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs index cec3807d..c3bd2800 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs +++ b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.double.cs @@ -28,17 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Factorization; - #if NATIVEMKL -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl -{ - using System; - using System.Numerics; - using System.Security; - using Properties; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Numerics; +using System.Security; +namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl +{ /// /// Intel's Math Kernel Library (MKL) linear algebra provider. /// diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs rename to src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs index 54230b96..64744284 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs +++ b/src/Numerics/Providers/LinearAlgebra/Mkl/MklLinearAlgebraProvider.float.cs @@ -28,17 +28,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra.Factorization; - #if NATIVEMKL -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl -{ - using System; - using System.Numerics; - using System.Security; - using Properties; +using MathNet.Numerics.LinearAlgebra.Factorization; +using MathNet.Numerics.Properties; +using System; +using System.Numerics; +using System.Security; +namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl +{ /// /// Intel's Math Kernel Library (MKL) linear algebra provider. /// diff --git a/src/Numerics/Algorithms/LinearAlgebra/Mkl/SafeNativeMethods.cs b/src/Numerics/Providers/LinearAlgebra/Mkl/SafeNativeMethods.cs similarity index 99% rename from src/Numerics/Algorithms/LinearAlgebra/Mkl/SafeNativeMethods.cs rename to src/Numerics/Providers/LinearAlgebra/Mkl/SafeNativeMethods.cs index b4a89e5f..7bf3ec2c 100644 --- a/src/Numerics/Algorithms/LinearAlgebra/Mkl/SafeNativeMethods.cs +++ b/src/Numerics/Providers/LinearAlgebra/Mkl/SafeNativeMethods.cs @@ -32,7 +32,7 @@ using System.Numerics; using System.Runtime.InteropServices; using System.Security; -namespace MathNet.Numerics.Algorithms.LinearAlgebra.Mkl +namespace MathNet.Numerics.Providers.LinearAlgebra.Mkl { /// /// P/Invoke methods to the native math libraries. diff --git a/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs index fa30de56..faff6d2e 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs @@ -3,9 +3,9 @@ // 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 @@ -14,10 +14,10 @@ // 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 @@ -28,11 +28,11 @@ // 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 MathNet.Numerics.Providers.LinearAlgebra; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs index 848b2d0d..3408bc95 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Complex32/LinearAlgebraProviderTests.cs @@ -28,11 +28,11 @@ // 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 MathNet.Numerics.Providers.LinearAlgebra; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs index 0a7c4034..e5075cda 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Double/LinearAlgebraProviderTests.cs @@ -28,11 +28,11 @@ // 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 MathNet.Numerics.Providers.LinearAlgebra; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs index 6da77fc1..1b38404e 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Single/LinearAlgebraProviderTests.cs @@ -28,11 +28,11 @@ // 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 MathNet.Numerics.Providers.LinearAlgebra; using NUnit.Framework; using System; using System.Collections.Generic; diff --git a/src/UnitTests/UseLinearAlgebraProvider.cs b/src/UnitTests/UseLinearAlgebraProvider.cs index 1dab37c6..8920f2c9 100644 --- a/src/UnitTests/UseLinearAlgebraProvider.cs +++ b/src/UnitTests/UseLinearAlgebraProvider.cs @@ -39,10 +39,9 @@ namespace MathNet.Numerics.UnitTests public void BeforeTest(TestDetails testDetails) { var provider = Properties.Settings.Default.LinearAlgebraProvider.ToLowerInvariant(); - if (provider.Contains("mkl")) { - Control.LinearAlgebraProvider = new Algorithms.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); + Control.LinearAlgebraProvider = new Providers.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); } }