diff --git a/MathNet.Numerics.Portable.sln b/MathNet.Numerics.Portable.sln index 5bb16739..96d41dbb 100644 --- a/MathNet.Numerics.Portable.sln +++ b/MathNet.Numerics.Portable.sln @@ -1,16 +1,18 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable47", "src\Numerics\Portable.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Portable", "src\Numerics\Portable.csproj", "{49205185-621E-FFB9-2104-887C9F1BBD13}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortable47", "src\FSharp\FSharpPortable.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpPortable", "src\FSharp\FSharpPortable.fsproj", "{F5F14D76-428D-43D7-8431-5B885F1BA419}" ProjectSection(ProjectDependencies) = postProject {49205185-621E-FFB9-2104-887C9F1BBD13} = {49205185-621E-FFB9-2104-887C9F1BBD13} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{81D2CBEF-1C80-4389-A341-F010E8F86CDB}" EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTestsPortable47", "src\FSharpUnitTests\FSharpUnitTestsPortable.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharpUnitTestsPortable", "src\FSharpUnitTests\FSharpUnitTestsPortable.fsproj", "{90CE8E32-354E-4728-8FE6-87342F469321}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestsPortable", "src\UnitTests\UnitTestsPortable.csproj", "{0672ED13-CE61-4D3C-B879-282472817235}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -37,11 +39,18 @@ Global {90CE8E32-354E-4728-8FE6-87342F469321}.Release136|Any CPU.Build.0 = Release136|Any CPU {90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.ActiveCfg = Release47|Any CPU {90CE8E32-354E-4728-8FE6-87342F469321}.Release47|Any CPU.Build.0 = Release47|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Debug47|Any CPU.ActiveCfg = Debug47|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Debug47|Any CPU.Build.0 = Debug47|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Release136|Any CPU.ActiveCfg = Release136|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Release136|Any CPU.Build.0 = Release136|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Release47|Any CPU.ActiveCfg = Release47|Any CPU + {0672ED13-CE61-4D3C-B879-282472817235}.Release47|Any CPU.Build.0 = Release47|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {90CE8E32-354E-4728-8FE6-87342F469321} = {81D2CBEF-1C80-4389-A341-F010E8F86CDB} + {0672ED13-CE61-4D3C-B879-282472817235} = {81D2CBEF-1C80-4389-A341-F010E8F86CDB} EndGlobalSection EndGlobal diff --git a/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj b/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj index c65d3307..20625415 100644 --- a/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTestsPortable.fsproj @@ -8,13 +8,14 @@ 90ce8e32-354e-4728-8fe6-87342f469321 Library FSharpPortableUnitTests - FSharpPortableUnitTests + MathNet.Numerics.FSharp.UnitTests v4.5 FSharpPortableUnitTests 11 DEBUG;TRACE + MathNet.Numerics.FSharp.UnitTests47 ..\..\out\test\debug\Portable47\ false false @@ -25,6 +26,7 @@ TRACE + MathNet.Numerics.FSharp.UnitTests47 ..\..\out\test\Portable47\ true true @@ -34,6 +36,7 @@ TRACE;NOSYSNUMERICS + MathNet.Numerics.FSharp.UnitTests136 ..\..\out\test\Portable136\ true true diff --git a/src/Numerics/NumberTheory/IntegerTheory.Euclid.cs b/src/Numerics/NumberTheory/IntegerTheory.Euclid.cs index 6b04d2fe..5696f5a1 100644 --- a/src/Numerics/NumberTheory/IntegerTheory.Euclid.cs +++ b/src/Numerics/NumberTheory/IntegerTheory.Euclid.cs @@ -118,8 +118,8 @@ namespace MathNet.Numerics.NumberTheory { long rem; #if PORTABLE - rem = a / b; - var quot = a % b; + rem = a % b; + var quot = a / b; #else long quot = Math.DivRem(a, b, out rem); #endif diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj index 428744ad..45978bfe 100644 --- a/src/Numerics/Numerics.csproj +++ b/src/Numerics/Numerics.csproj @@ -46,8 +46,7 @@ TRACE;DEBUG;NATIVEMKL prompt 4 - - + AllRules.ruleset diff --git a/src/Numerics/Portable.csproj b/src/Numerics/Portable.csproj index 9742d922..513c04fa 100644 --- a/src/Numerics/Portable.csproj +++ b/src/Numerics/Portable.csproj @@ -23,6 +23,8 @@ true prompt 4 + + AllRules.ruleset Profile47 @@ -32,18 +34,22 @@ true pdbonly prompt - MinimumRecommendedRules.ruleset + 4 + AllRules.ruleset + 1591 Profile136 TRACE;PORTABLE;NOSYSNUMERICS - bin\Portable136\ + ..\..\out\lib\Portable136\ ..\..\out\lib\Portable136\MathNet.Numerics.XML true pdbonly AnyCPU prompt - MinimumRecommendedRules.ruleset + 4 + AllRules.ruleset + 1591 diff --git a/src/Numerics/Properties/AssemblyInfo.cs b/src/Numerics/Properties/AssemblyInfo.cs index 82fb4229..bdf01476 100644 --- a/src/Numerics/Properties/AssemblyInfo.cs +++ b/src/Numerics/Properties/AssemblyInfo.cs @@ -29,9 +29,9 @@ using System; using System.Reflection; using System.Resources; +using System.Runtime.CompilerServices; #if !PORTABLE -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; #endif @@ -50,6 +50,9 @@ using System.Runtime.InteropServices; #if PORTABLE [assembly: AssemblyTitle("Math.NET Numerics - Portable Edition")] +[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests")] +[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests47")] +[assembly: InternalsVisibleTo("MathNet.Numerics.UnitTests136")] #else diff --git a/src/UnitTests/ArrayHelpers.cs b/src/UnitTests/ArrayHelpers.cs index 42bce928..bd818f23 100644 --- a/src/UnitTests/ArrayHelpers.cs +++ b/src/UnitTests/ArrayHelpers.cs @@ -24,6 +24,11 @@ // OTHER DEALINGS IN THE SOFTWARE. // +#if PORTABLE +using System.Collections.Generic; +using System.Linq; +#endif + namespace MathNet.Numerics.UnitTests { using System; @@ -59,7 +64,7 @@ namespace MathNet.Numerics.UnitTests /// /// The type of the elements of the array. /// The one-dimensional, zero-based Array to search. - /// The Predicate<> that defines the conditions of the elements to search for. + /// The Predicate that defines the conditions of the elements to search for. /// true if array contains one or more elements that match the conditions defined by the specified predicate; otherwise, false. public static bool Exists(this List list, Predicate match) { diff --git a/src/UnitTests/AssertHelpers.cs b/src/UnitTests/AssertHelpers.cs index cfe88ce7..6b241759 100644 --- a/src/UnitTests/AssertHelpers.cs +++ b/src/UnitTests/AssertHelpers.cs @@ -24,11 +24,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System.Collections.Generic; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests { - using System.Collections.Generic; - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// A class which includes some assertion helper methods particularly for numerical code. diff --git a/src/UnitTests/ComplexTests/Complex32Test.cs b/src/UnitTests/ComplexTests/Complex32Test.cs index fe08a9af..64bf0154 100644 --- a/src/UnitTests/ComplexTests/Complex32Test.cs +++ b/src/UnitTests/ComplexTests/Complex32Test.cs @@ -24,11 +24,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.ComplexTests { - using System; - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Complex32 tests. diff --git a/src/UnitTests/ComplexTests/ComplexTest.TextHandling.cs b/src/UnitTests/ComplexTests/ComplexTest.TextHandling.cs index b5f2bcd5..a38eae29 100644 --- a/src/UnitTests/ComplexTests/ComplexTest.TextHandling.cs +++ b/src/UnitTests/ComplexTests/ComplexTest.TextHandling.cs @@ -24,12 +24,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using System.Globalization; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.ComplexTests { - using System; - using System.Globalization; - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Complex text handling tests diff --git a/src/UnitTests/ComplexTests/ComplexTest.cs b/src/UnitTests/ComplexTests/ComplexTest.cs index e0b47b3b..dc10b314 100644 --- a/src/UnitTests/ComplexTests/ComplexTest.cs +++ b/src/UnitTests/ComplexTests/ComplexTest.cs @@ -24,10 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.ComplexTests { - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Complex extension methods tests. diff --git a/src/UnitTests/IntegralTransformsTests/FourierTest.cs b/src/UnitTests/IntegralTransformsTests/FourierTest.cs index cf325024..61ca37c4 100644 --- a/src/UnitTests/IntegralTransformsTests/FourierTest.cs +++ b/src/UnitTests/IntegralTransformsTests/FourierTest.cs @@ -25,7 +25,6 @@ // using System; -using System.Numerics; using MathNet.Numerics.Distributions; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.IntegralTransforms.Algorithms; @@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests { using Random = System.Random; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif + /// /// Fourier test. /// diff --git a/src/UnitTests/IntegralTransformsTests/HartleyTest.cs b/src/UnitTests/IntegralTransformsTests/HartleyTest.cs index 06451e29..e364e1a0 100644 --- a/src/UnitTests/IntegralTransformsTests/HartleyTest.cs +++ b/src/UnitTests/IntegralTransformsTests/HartleyTest.cs @@ -25,7 +25,6 @@ // using System; -using System.Numerics; using MathNet.Numerics.Distributions; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.IntegralTransforms.Algorithms; @@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests { using Random = System.Random; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif + /// /// Hartley tests. /// diff --git a/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs b/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs index e766d385..9fef9cdf 100644 --- a/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs +++ b/src/UnitTests/IntegralTransformsTests/InverseTransformTest.cs @@ -25,7 +25,6 @@ // using System; -using System.Numerics; using MathNet.Numerics.Distributions; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.IntegralTransforms.Algorithms; @@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests { using Random = System.Random; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif + /// /// Inverse Transform test. /// diff --git a/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs b/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs index 9ba7996b..c9164f6a 100644 --- a/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs +++ b/src/UnitTests/IntegralTransformsTests/MatchingNaiveTransformTest.cs @@ -25,7 +25,6 @@ // using System; -using System.Numerics; using MathNet.Numerics.Distributions; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.IntegralTransforms.Algorithms; @@ -36,6 +35,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests { using Random = System.Random; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif + /// /// Matching Naive transform tests. /// diff --git a/src/UnitTests/IntegralTransformsTests/ParsevalTheoremTest.cs b/src/UnitTests/IntegralTransformsTests/ParsevalTheoremTest.cs index 821cb8e4..65728c28 100644 --- a/src/UnitTests/IntegralTransformsTests/ParsevalTheoremTest.cs +++ b/src/UnitTests/IntegralTransformsTests/ParsevalTheoremTest.cs @@ -25,7 +25,6 @@ // using System.Linq; -using System.Numerics; using MathNet.Numerics.Distributions; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.IntegralTransforms.Algorithms; @@ -37,6 +36,12 @@ namespace MathNet.Numerics.UnitTests.IntegralTransformsTests { using Random = System.Random; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif + /// /// Parseval theorem verification tests. /// diff --git a/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs b/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs index 1aa911c3..41f2ae7d 100644 --- a/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs +++ b/src/UnitTests/LinearAlgebraProviderTests/Complex/LinearAlgebraProviderTests.cs @@ -39,7 +39,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraProviderTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Base class for linear algebra provider tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs index aff8b533..6eae4fe4 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseMatrixTests.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Dense matrix tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs index c2fef366..564fcdda 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorArithmeticTheory.cs @@ -28,12 +28,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using MathNet.Numerics.LinearAlgebra; +using MathNet.Numerics.LinearAlgebra.Complex; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using LinearAlgebra; - using LinearAlgebra.Complex; - using NUnit.Framework; - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif [TestFixture] public class DenseVectorArithmeticTheory : VectorArithmeticTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs index b72f21db..0cb3f4ee 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DenseVectorTests.cs @@ -36,7 +36,11 @@ using System.Collections.Generic; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Dense vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs index 39916241..cdcad687 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/DiagonalMatrixTests.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Diagonal matrix tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs index 9ff97c6b..ab55e25f 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/CholeskyTests.cs @@ -30,7 +30,11 @@ using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Cholesky factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs index 6e63ec6f..cc71a1f8 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/EvdTests.cs @@ -29,7 +29,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues 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 897ff60f..e72836b5 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/GramSchmidtTests.cs @@ -31,7 +31,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 ce46a784..a0b6e241 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/LUTests.cs @@ -30,7 +30,11 @@ using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 058184e8..1cb4c23b 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/QRTests.cs @@ -32,7 +32,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 e0d36c4e..6eb2b4fb 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/SvdTests.cs @@ -30,7 +30,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Svd factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserCholeskyTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserCholeskyTests.cs index cfdb3797..b44e2785 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserCholeskyTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserCholeskyTests.cs @@ -24,11 +24,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Cholesky factorization tests for a user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserEvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserEvdTests.cs index 0f51a7da..f4380ebc 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserEvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserEvdTests.cs @@ -28,7 +28,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues factorization tests for an user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserGramSchmidtTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserGramSchmidtTests.cs index 0af16ed7..ed133826 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserGramSchmidtTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserGramSchmidtTests.cs @@ -30,7 +30,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// GramSchmidt factorization tests for a user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserLUTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserLUTests.cs index 936bafbc..95692113 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserLUTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserLUTests.cs @@ -24,11 +24,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System; - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// LU factorization tests for a user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs index 281ac205..0746e26d 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserQRTests.cs @@ -31,7 +31,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// QR factorization tests for a user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserSvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserSvdTests.cs index 5b5943a1..25446922 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserSvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Factorization/UserSvdTests.cs @@ -29,7 +29,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Svd factorization tests for a user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs b/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs index 457d3a79..becc1fef 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixLoader.cs @@ -37,7 +37,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Base class for matrix tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs index 7768eca4..14d34ea8 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixStructureTheory.cs @@ -37,7 +37,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif [TestFixture] public class MatrixStructureTheory : MatrixStructureTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs index 59868bea..ca8923b5 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.Arithmetic.cs @@ -32,7 +32,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Abstract class with the common set of matrix tests diff --git a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.cs index c9f31829..b352dceb 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/MatrixTests.cs @@ -24,10 +24,10 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - 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 c45e56d9..22bce1c4 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/BiCgStabTest.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 64f11d32..80f39fec 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/GpBiCgTest.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 944bd0a8..3e449020 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/MlkBiCgStabTest.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 c6b1b11c..7b1cc04f 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Iterative/TFQMRTest.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Iterative { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 59e9c326..93453a57 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/IteratorTest.cs @@ -37,7 +37,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Iterator tests diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs index 0eaa537a..a87e68b0 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/Preconditioners/IluptElementSorterTest.cs @@ -35,7 +35,6 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.Preconditioners { - #if NOSYSNUMERICS using Complex = Numerics.Complex; #else diff --git a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs index 289d44f2..6daa33d3 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/DivergenceStopCriteriumTest.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 26f10323..fb76c96b 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/FailureStopCriteriumTest.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 c307ec3a..8d602171 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/IterationCountStopCriteriumTest.cs @@ -35,7 +35,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 8f5eb0f0..5888bad8 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/Solvers/StopCriterium/ResidualStopCriteriumTest.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex.Solvers.StopCriterium { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Residual stop criterium tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs index df6ea200..25a2cfd5 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseMatrixTests.cs @@ -36,7 +36,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Sparse matrix tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs index a46b0c83..bcbdb56e 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorArithmeticTheory.cs @@ -34,7 +34,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif [TestFixture] public class SparseVectorArithmeticTheory : VectorArithmeticTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs index 37cdf746..421c17bd 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/SparseVectorTest.cs @@ -37,7 +37,11 @@ using System.Collections.Generic; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Sparse vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs index b14b2d69..1014bd4f 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrix.cs @@ -29,7 +29,11 @@ using MathNet.Numerics.LinearAlgebra.Storage; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// User-defined matrix implementation (internal class for testing purposes) diff --git a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs index d960b911..68d40ca2 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedMatrixTests.cs @@ -28,7 +28,11 @@ using MathNet.Numerics.LinearAlgebra; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Test class for user-defined matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs index 930eb572..1fd842ff 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVector.cs @@ -29,7 +29,11 @@ using MathNet.Numerics.LinearAlgebra.Storage; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// 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 f1e9f62e..84703631 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/UserDefinedVectorTests.cs @@ -30,7 +30,11 @@ using System.Collections.Generic; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Test class for user-defined vector. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs b/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs index 0ca9cebc..ed9804fe 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorArithmeticTheory.cs @@ -28,10 +28,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif [TestFixture] public abstract class VectorArithmeticTheory : VectorArithmeticTheory diff --git a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs index cde0aad5..4d358f08 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Arithmetic.cs @@ -24,13 +24,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; using MathNet.Numerics.LinearAlgebra; using NUnit.Framework; -using System; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Abstract class with the common arithmetic set of vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Norm.cs b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Norm.cs index 78b97eda..c37926b3 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Norm.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.Norm.cs @@ -24,11 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System; - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Abstract class with the norms set of vector tests. @@ -91,7 +95,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { var vector = CreateVector(Data); AssertHelpers.AlmostEqual(5.09901951359279, vector.InfinityNorm(), 14); - AssertHelpers.AlmostEqual(5.09901951359279, vector.Norm(Double.PositiveInfinity), 14); + AssertHelpers.AlmostEqual(5.09901951359279, vector.Norm(double.PositiveInfinity), 14); } /// diff --git a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs index 72daca2e..f0b149dc 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex/VectorTests.cs @@ -39,7 +39,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Abstract class with the common set of vector tests. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs index 16926136..7b78ea87 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/EvdTests.cs @@ -29,8 +29,13 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System.Numerics; - using Complex32 = Numerics.Complex32; + using Numerics; + +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserEvdTests.cs b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserEvdTests.cs index 37a36eba..f0bcdc66 100644 --- a/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserEvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Complex32/Factorization/UserEvdTests.cs @@ -28,8 +28,13 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Complex32.Factorization { - using System.Numerics; - using Complex32 = Numerics.Complex32; + using Numerics; + +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues factorization tests for an user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs index d91d533c..fc00fac7 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/EvdTests.cs @@ -29,7 +29,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserEvdTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserEvdTests.cs index 73c8f39a..8917c218 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserEvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserEvdTests.cs @@ -28,7 +28,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues factorization tests for an user matrix. diff --git a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs index 604ebe7c..26333d05 100644 --- a/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs +++ b/src/UnitTests/LinearAlgebraTests/MatrixStructureTheory.cs @@ -121,6 +121,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests Assert.That(clone.ColumnCount, Is.EqualTo(matrix.ColumnCount)); } +#if !PORTABLE [Theory] public void CanCloneUsingICloneable(Matrix matrix) { @@ -130,6 +131,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests Assert.That(clone.RowCount, Is.EqualTo(matrix.RowCount)); Assert.That(clone.ColumnCount, Is.EqualTo(matrix.ColumnCount)); } +#endif [Theory] public void CanCopyTo(Matrix matrix) diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs index d53f2704..abb474d1 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/EvdTests.cs @@ -29,7 +29,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues factorization tests for a dense matrix. diff --git a/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserEvdTests.cs b/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserEvdTests.cs index efb2addb..2aec6a29 100644 --- a/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserEvdTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Single/Factorization/UserEvdTests.cs @@ -28,7 +28,11 @@ using NUnit.Framework; namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Single.Factorization { - using System.Numerics; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Eigenvalues factorization tests for an user matrix. diff --git a/src/UnitTests/MatrixHelpers.cs b/src/UnitTests/MatrixHelpers.cs index 35f2501b..8f7e9834 100644 --- a/src/UnitTests/MatrixHelpers.cs +++ b/src/UnitTests/MatrixHelpers.cs @@ -24,12 +24,17 @@ // OTHER DEALINGS IN THE SOFTWARE. // -using MathNet.Numerics.LinearAlgebra; using System; -using System.Numerics; +using MathNet.Numerics.LinearAlgebra; namespace MathNet.Numerics.UnitTests { +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif + /// /// Matrix utility functions to simplify tests. /// diff --git a/src/UnitTests/NumberTheoryTests/GcdRelatedTestBigInteger.cs b/src/UnitTests/NumberTheoryTests/GcdRelatedTestBigInteger.cs index a07301e8..3f88f9c2 100644 --- a/src/UnitTests/NumberTheoryTests/GcdRelatedTestBigInteger.cs +++ b/src/UnitTests/NumberTheoryTests/GcdRelatedTestBigInteger.cs @@ -24,13 +24,15 @@ // OTHER DEALINGS IN THE SOFTWARE. // +#if !NOSYSNUMERICS + +using System; +using System.Numerics; +using MathNet.Numerics.NumberTheory; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests.NumberTheoryTests { - using System; - using System.Numerics; - using NumberTheory; - using NUnit.Framework; - /// /// GreatestCommonDivisor related test for BigInteger. /// @@ -217,3 +219,4 @@ namespace MathNet.Numerics.UnitTests.NumberTheoryTests } } } +#endif diff --git a/src/UnitTests/Properties/Settings.Designer.cs b/src/UnitTests/Properties/Settings.Designer.cs index 67f5520f..6279ddcc 100644 --- a/src/UnitTests/Properties/Settings.Designer.cs +++ b/src/UnitTests/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.225 +// Runtime Version:4.0.30319.18051 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace MathNet.Numerics.UnitTests.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/UnitTests/Random/SystemCryptoTests.cs b/src/UnitTests/Random/SystemCryptoTests.cs index 830f9a45..82ba2555 100644 --- a/src/UnitTests/Random/SystemCryptoTests.cs +++ b/src/UnitTests/Random/SystemCryptoTests.cs @@ -24,6 +24,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // +#if !PORTABLE namespace MathNet.Numerics.UnitTests.Random { using Numerics.Random; @@ -44,3 +45,4 @@ namespace MathNet.Numerics.UnitTests.Random } } } +#endif diff --git a/src/UnitTests/RootFindingTests/FindRootsTest.cs b/src/UnitTests/RootFindingTests/FindRootsTest.cs index ddb22a8f..5eb83081 100644 --- a/src/UnitTests/RootFindingTests/FindRootsTest.cs +++ b/src/UnitTests/RootFindingTests/FindRootsTest.cs @@ -29,11 +29,16 @@ // using System; -using System.Numerics; using NUnit.Framework; namespace MathNet.Numerics.UnitTests.RootFindingTests { +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif + [TestFixture] internal class FindRootsTest { diff --git a/src/UnitTests/TrigonometryTest.cs b/src/UnitTests/TrigonometryTest.cs index 31f155c9..0ddd0141 100644 --- a/src/UnitTests/TrigonometryTest.cs +++ b/src/UnitTests/TrigonometryTest.cs @@ -24,11 +24,16 @@ // OTHER DEALINGS IN THE SOFTWARE. // +using System; +using NUnit.Framework; + namespace MathNet.Numerics.UnitTests { - using System; - using System.Numerics; - using NUnit.Framework; +#if NOSYSNUMERICS + using Complex = Numerics.Complex; +#else + using Complex = System.Numerics.Complex; +#endif /// /// Trigonometry tests. diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index ce682207..98389a9e 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -17,16 +17,17 @@ false + DEBUG;TRACE ..\..\out\test\debug\Net40\ false true full false - DEBUG;TRACE;SYSNUMERICS prompt 4 AnyCPU + 1591 ..\..\out\test\Net40\ @@ -34,10 +35,11 @@ false pdbonly true - TRACE;SYSNUMERICS + TRACE prompt 4 AllRules.ruleset + 1591 ..\..\out\test\signed\Net40\ @@ -45,10 +47,11 @@ true pdbonly true - TRACE;SYSNUMERICS;STRONGNAME + TRACE;STRONGNAME prompt 4 AllRules.ruleset + 1591 @@ -66,36 +69,20 @@ - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + - - Code - - - Code - - - Code - + + + @@ -147,556 +134,202 @@ - - Code - + - - Code - + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + + + + + + + + + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + + + + + + + + + + + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + - - Code - - - Code - - - Code - - - Code - + + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + + + + + + + + + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + + + + + + + + + + + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + - - Code - - - Code - - - Code - + + + - - Code - - - Code - - - Code - + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Code - + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + + + + + + + + + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + + + + + + + + + + + + + - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + + + + + - - Code - - - Code - - - Code - + + + @@ -1041,13 +674,5 @@ - - \ No newline at end of file diff --git a/src/UnitTests/UnitTestsPortable.csproj b/src/UnitTests/UnitTestsPortable.csproj new file mode 100644 index 00000000..172682ae --- /dev/null +++ b/src/UnitTests/UnitTestsPortable.csproj @@ -0,0 +1,361 @@ + + + + 10.0 + Debug + AnyCPU + 8.0.30703 + 2.0 + {0672ED13-CE61-4D3C-B879-282472817235} + Library + Properties + MathNet.Numerics.UnitTests + MathNet.Numerics.UnitTests + v4.5 + 512 + + + TRACE;DEBUG;PORTABLE + MathNet.Numerics.UnitTests47 + ..\..\out\test\debug\Portable47\ + false + full + true + prompt + 4 + 1591 + + + TRACE;PORTABLE + MathNet.Numerics.UnitTests47 + ..\..\out\test\Portable47\ + ..\..\out\test\Portable47\MathNet.Numerics.XML + true + pdbonly + prompt + MinimumRecommendedRules.ruleset + 1591 + + + TRACE;PORTABLE;NOSYSNUMERICS + MathNet.Numerics.UnitTests136 + ..\..\out\test\Portable136\ + ..\..\out\test\Portable136\MathNet.Numerics.XML + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + 1591 + + + + + + True + True + Settings.settings + + + + + + ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll + + + + + + + + + + + + + {49205185-621e-ffb9-2104-887c9f1bbd13} + Portable + + + + + data\Codeplex-5667.csv + Always + + + data\Github-Cureos-1.csv + Always + + + data\Matlab\A.mat + Always + + + data\Matlab\collection-nocompress.mat + Always + + + data\Matlab\collection.mat + Always + + + data\Matlab\complex.mat + Always + + + data\Matlab\sparse-large.mat + Always + + + data\Matlab\sparse-small.mat + Always + + + data\Matlab\sparse_complex.mat + Always + + + data\Matlab\v.mat + Always + + + data\NIST\AtmWtAgt.dat + Always + + + data\NIST\Bennett5.dat + Always + + + data\NIST\BoxBOD.dat + Always + + + data\NIST\Chwirut1.dat + Always + + + data\NIST\Chwirut2.dat + Always + + + data\NIST\DanWood.dat + Always + + + data\NIST\Eckerle4.dat + Always + + + data\NIST\ENSO.dat + Always + + + data\NIST\Filip.dat + Always + + + data\NIST\Gauss1.dat + Always + + + data\NIST\Gauss2.dat + Always + + + data\NIST\Gauss3.dat + Always + + + data\NIST\Hahn1.dat + Always + + + data\NIST\Kirby2.dat + Always + + + data\NIST\Lanczos1.dat + Always + + + data\NIST\Lanczos2.dat + Always + + + data\NIST\Lanczos3.dat + Always + + + data\NIST\Lew.dat + Always + + + data\NIST\Longley.dat + Always + + + data\NIST\Lottery.dat + Always + + + data\NIST\Mavro.dat + Always + + + data\NIST\MGH09.dat + Always + + + data\NIST\MGH10.dat + Always + + + data\NIST\MGH17.dat + Always + + + data\NIST\Michelso.dat + Always + + + data\NIST\Misra1a.dat + Always + + + data\NIST\Misra1b.dat + Always + + + data\NIST\Misra1c.dat + Always + + + data\NIST\Misra1d.dat + Always + + + data\NIST\Nelson.dat + Always + + + data\NIST\NoInt1.dat + Always + + + data\NIST\NoInt2.dat + Always + + + data\NIST\Norris.dat + Always + + + data\NIST\NumAcc1.dat + Always + + + data\NIST\NumAcc2.dat + Always + + + data\NIST\NumAcc3.dat + Always + + + data\NIST\NumAcc4.dat + Always + + + data\NIST\Pontius.dat + Always + + + data\NIST\Rat42.dat + Always + + + data\NIST\Rat43.dat + Always + + + data\NIST\Roszman1.dat + Always + + + data\NIST\SiRstvt.dat + Always + + + data\NIST\SmLs01t.dat + Always + + + data\NIST\SmLs02t.dat + Always + + + data\NIST\SmLs03t.dat + Always + + + data\NIST\SmLs04t.dat + Always + + + data\NIST\SmLs05t.dat + Always + + + data\NIST\SmLs06t.dat + Always + + + data\NIST\SmLs07t.dat + Always + + + data\NIST\SmLs08t.dat + Always + + + data\NIST\SmLs09t.dat + Always + + + data\NIST\Thurber.dat + Always + + + data\NIST\Wampler1.dat + Always + + + data\NIST\Wampler2.dat + Always + + + data\NIST\Wampler3.dat + Always + + + data\NIST\Wampler4.dat + Always + + + data\NIST\Wampler5.dat + Always + + + + data\NIST\Meixner.dat + Always + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + \ No newline at end of file diff --git a/src/UnitTests/UseLinearAlgebraProvider.cs b/src/UnitTests/UseLinearAlgebraProvider.cs index 8920f2c9..ac6edf69 100644 --- a/src/UnitTests/UseLinearAlgebraProvider.cs +++ b/src/UnitTests/UseLinearAlgebraProvider.cs @@ -38,11 +38,13 @@ namespace MathNet.Numerics.UnitTests { public void BeforeTest(TestDetails testDetails) { +#if NATIVEMKL var provider = Properties.Settings.Default.LinearAlgebraProvider.ToLowerInvariant(); if (provider.Contains("mkl")) { Control.LinearAlgebraProvider = new Providers.LinearAlgebra.Mkl.MklLinearAlgebraProvider(); } +#endif } public void AfterTest(TestDetails details)