diff --git a/MathNet.Numerics.All.sln b/MathNet.Numerics.All.sln index ec0a55d2..a47244d1 100644 --- a/MathNet.Numerics.All.sln +++ b/MathNet.Numerics.All.sln @@ -52,7 +52,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40 ProjectSection(SolutionItems) = preProject build.fsx = build.fsx build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec - build\packages.config = build\packages.config + paket.dependencies = paket.dependencies + paket.lock = paket.lock EndProjectSection EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp-Net35", "src\FSharp\FSharp-Net35.fsproj", "{D5DBCEC0-9D9D-4A62-9EE0-F78E1895D4F4}" diff --git a/MathNet.Numerics.Data.sln b/MathNet.Numerics.Data.sln index 6f2d3db2..30d9017c 100644 --- a/MathNet.Numerics.Data.sln +++ b/MathNet.Numerics.Data.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Matlab", "src\Data\Matlab\Matlab.csproj", "{550FB330-C86F-4C9D-9B4C-6D830CEB7520}" EndProject @@ -25,7 +25,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D954831A build.fsx = build.fsx build\MathNet.Numerics.Extension.nuspec = build\MathNet.Numerics.Extension.nuspec build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec - build\packages.config = build\packages.config + paket.dependencies = paket.dependencies + paket.lock = paket.lock EndProjectSection EndProject Global diff --git a/MathNet.Numerics.Portable.sln b/MathNet.Numerics.Portable.sln index 2c80e774..59aeb708 100644 --- a/MathNet.Numerics.Portable.sln +++ b/MathNet.Numerics.Portable.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F37492-38AE-4186-8A7F-17B0B080942C}" ProjectSection(SolutionItems) = preProject @@ -45,17 +45,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}" ProjectSection(SolutionItems) = preProject build.fsx = build.fsx - build\packages.config = build\packages.config - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{305FCCF4-B205-4E98-B58A-48117C3CA4E3}" - ProjectSection(SolutionItems) = preProject - build\NuGet\FSharp\MathNet.Numerics.FSharp.nuspec = build\NuGet\FSharp\MathNet.Numerics.FSharp.nuspec - build\NuGet\FSharp.Signed\MathNet.Numerics.FSharp.Signed.nuspec = build\NuGet\FSharp.Signed\MathNet.Numerics.FSharp.Signed.nuspec - build\NuGet\Numerics\MathNet.Numerics.nuspec = build\NuGet\Numerics\MathNet.Numerics.nuspec - build\NuGet\Numerics.Signed\MathNet.Numerics.Signed.nuspec = build\NuGet\Numerics.Signed\MathNet.Numerics.Signed.nuspec - build\NuGet\nuget-signed.proj = build\NuGet\nuget-signed.proj - build\NuGet\nuget.proj = build\NuGet\nuget.proj + paket.dependencies = paket.dependencies + paket.lock = paket.lock EndProjectSection EndProject Global @@ -147,7 +138,6 @@ Global {2B6BE5F8-843E-4E36-8B8E-9CA3C9503198} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} {8A60894F-D090-4FC5-9535-E244E90A44C1} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} {EC24DA9F-8772-491D-BA56-3ADA75072B3D} = {9D409E95-D567-4C2F-A0DF-87A6DF5B3A2E} - {305FCCF4-B205-4E98-B58A-48117C3CA4E3} = {B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = src\Numerics\Numerics.csproj diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index bfb28cf0..f10aa04e 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -25,16 +25,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\UnitTests\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A4A66FA9-C00C-4D5C-A776-27516EA0C536}" ProjectSection(SolutionItems) = preProject + docs\tools\build-docs.fsx = docs\tools\build-docs.fsx build.fsx = build.fsx build\MathNet.Numerics.Extension.nuspec = build\MathNet.Numerics.Extension.nuspec build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec - build\packages.config = build\packages.config - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{DB89F4DB-5204-4B38-B9F5-FE11E69D32AD}" - ProjectSection(SolutionItems) = preProject - docs\tools\build-docs.fsx = docs\tools\build-docs.fsx - docs\tools\packages.config = docs\tools\packages.config + paket.dependencies = paket.dependencies + paket.lock = paket.lock EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{039229DA-AFDA-48DB-B7FC-B064691DEE96}" @@ -97,9 +93,6 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {DB89F4DB-5204-4B38-B9F5-FE11E69D32AD} = {A4A66FA9-C00C-4D5C-A776-27516EA0C536} - EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = src\Numerics\Numerics.csproj EndGlobalSection diff --git a/src/FSharpUnitTests/App.config b/src/FSharpUnitTests/App.config index 8d98231f..8a149492 100644 --- a/src/FSharpUnitTests/App.config +++ b/src/FSharpUnitTests/App.config @@ -4,9 +4,7 @@ - - - + diff --git a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj index d4177aea..6ca2e9c7 100644 --- a/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj +++ b/src/FSharpUnitTests/FSharpUnitTests-Net35.fsproj @@ -18,9 +18,9 @@ pdbonly true true - ..\..\out\test\Net40\ - ..\..\obj\test\Net40\ - ..\..\obj\test\Net40\ + ..\..\out\test\Net35\ + ..\..\obj\test\Net35\ + ..\..\obj\test\Net35\ TRACE;NET35;NOSYSNUMERICS 3 @@ -29,9 +29,9 @@ full false false - ..\..\out\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ - ..\..\obj\test-debug\Net40\ + ..\..\out\test-debug\Net35\ + ..\..\obj\test-debug\Net35\ + ..\..\obj\test-debug\Net35\ DEBUG;TRACE;NET35;NOSYSNUMERICS 3 @@ -41,19 +41,21 @@ true TRACE;NET35;NOSYSNUMERICS 3 - ..\..\out\test-signed\Net40\ - ..\..\obj\test-signed\Net40\ - ..\..\obj\test-signed\Net40\ + ..\..\out\test-signed\Net35\ + ..\..\obj\test-signed\Net35\ + ..\..\obj\test-signed\Net35\ $(DefineConstants);NOFSSLICESET1D - - - - - + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + @@ -69,9 +71,11 @@ - + + + FSharp-Net35 {d5dbcec0-9d9d-4a62-9ee0-f78e1895d4f4} @@ -83,13 +87,6 @@ True - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets - - - $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets - - diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/CholeskyTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/CholeskyTests.cs index 85707900..c9e23b3e 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/CholeskyTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/CholeskyTests.cs @@ -203,7 +203,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { for (var j = 0; j < matrixB.ColumnCount; j++) { - Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9); + Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8); } } @@ -294,7 +294,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { for (var j = 0; j < matrixB.ColumnCount; j++) { - Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9); + Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8); } } diff --git a/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserCholeskyTests.cs b/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserCholeskyTests.cs index c3c91cfe..e33ea480 100644 --- a/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserCholeskyTests.cs +++ b/src/UnitTests/LinearAlgebraTests/Double/Factorization/UserCholeskyTests.cs @@ -202,7 +202,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { for (var j = 0; j < matrixB.ColumnCount; j++) { - Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9); + Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8); } } @@ -293,7 +293,7 @@ namespace MathNet.Numerics.UnitTests.LinearAlgebraTests.Double.Factorization { for (var j = 0; j < matrixB.ColumnCount; j++) { - Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-9); + Assert.AreEqual(matrixB[i, j], matrixBReconstruct[i, j], 1e-8); } } diff --git a/src/UnitTests/UnitTests-Net35.csproj b/src/UnitTests/UnitTests-Net35.csproj index a25891ce..240b9cf5 100644 --- a/src/UnitTests/UnitTests-Net35.csproj +++ b/src/UnitTests/UnitTests-Net35.csproj @@ -40,6 +40,19 @@ 1591 false + + TRACE;NET35;NOSYSNUMERICS + ..\..\out\test-signed\Net35\ + ..\..\obj\test-signed\Net35\ + ..\..\obj\test-signed\Net35\ + true + pdbonly + prompt + MinimumRecommendedRules.ruleset + 1591 + false + 4 +