From e1435e283eb94a29de1ce30d26feb06c4dd11c2e Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sun, 11 Feb 2018 21:09:04 +0100 Subject: [PATCH] Examples: update all examples to use v4.0.0 --- examples/examples-csharp/examples-csharp.csproj | 2 +- examples/examples-fsharp/examples-fsharp.fsproj | 8 +++++--- examples/net45-console-csharp/Program.cs | 2 +- .../net45-console-csharp.csproj | 2 +- examples/net45-console-fsharp/Program.fs | 3 +-- .../net45-console-fsharp.fsproj | 17 +++++++---------- examples/net45-console-fsharp/packages.config | 9 ++++----- examples/net471-console-csharp/Program.cs | 5 +---- .../net471-console-csharp.csproj | 4 ++-- examples/net471-console-fsharp/Program.fs | 5 +---- .../net471-console-fsharp.fsproj | 16 +++++++--------- examples/net471-console-fsharp/packages.config | 7 +++---- examples/netcore11-console-csharp/Program.cs | 5 +---- .../netcore11-console-csharp.csproj | 2 +- examples/netcore11-console-fsharp/Program.fs | 5 +---- .../netcore11-console-fsharp.fsproj | 14 ++++++++++++-- examples/netcore20-console-csharp/Program.cs | 5 +---- .../netcore20-console-csharp.csproj | 2 +- examples/netcore20-console-fsharp/Program.fs | 5 +---- .../netcore20-console-fsharp.fsproj | 10 ++++++++-- 20 files changed, 60 insertions(+), 68 deletions(-) diff --git a/examples/examples-csharp/examples-csharp.csproj b/examples/examples-csharp/examples-csharp.csproj index 1a52a466..70911cf5 100644 --- a/examples/examples-csharp/examples-csharp.csproj +++ b/examples/examples-csharp/examples-csharp.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/examples-fsharp/examples-fsharp.fsproj b/examples/examples-fsharp/examples-fsharp.fsproj index aba42f8a..471a01bc 100644 --- a/examples/examples-fsharp/examples-fsharp.fsproj +++ b/examples/examples-fsharp/examples-fsharp.fsproj @@ -3,6 +3,8 @@ net45;net46;netstandard1.6;netstandard2.0 false + 4.4.3.0 + 4.3.3 true Library false @@ -22,9 +24,9 @@ - - - + + + diff --git a/examples/net45-console-csharp/Program.cs b/examples/net45-console-csharp/Program.cs index 14521fb1..fd9a0aa8 100644 --- a/examples/net45-console-csharp/Program.cs +++ b/examples/net45-console-csharp/Program.cs @@ -17,7 +17,7 @@ namespace Integration Matrix matrix = CreateMatrix.Random(10, 10, 100); Vector vector = matrix.Svd().S; Fourier.Forward(vector.AsArray()); - Console.WriteLine($"LinearAlgebra={Control.LinearAlgebraProvider}; FFT={Control.FourierTransformProvider}"); + Console.WriteLine(Control.Describe()); Console.WriteLine($"DC={vector[0].Magnitude}; Low={vector[1].Magnitude}; Hight={vector[5].Magnitude}"); if (Debugger.IsAttached) diff --git a/examples/net45-console-csharp/net45-console-csharp.csproj b/examples/net45-console-csharp/net45-console-csharp.csproj index 4d797e3c..ea479769 100644 --- a/examples/net45-console-csharp/net45-console-csharp.csproj +++ b/examples/net45-console-csharp/net45-console-csharp.csproj @@ -49,7 +49,7 @@ - 4.0.0-beta05 + 4.0.0 2.2.0 diff --git a/examples/net45-console-fsharp/Program.fs b/examples/net45-console-fsharp/Program.fs index ac69a109..2809cf4f 100644 --- a/examples/net45-console-fsharp/Program.fs +++ b/examples/net45-console-fsharp/Program.fs @@ -1,6 +1,5 @@ open System open System.Diagnostics - open MathNet.Numerics open MathNet.Numerics.IntegralTransforms open MathNet.Numerics.LinearAlgebra @@ -15,7 +14,7 @@ let main argv = let matrix : Matrix = DenseMatrix.randomSeed 10 10 100 let vector = (matrix |> Matrix.svd).S vector.AsArray() |> Fourier.Forward - printfn "LinearAlgebra=%O; FFT=%O" Control.LinearAlgebraProvider Control.FourierTransformProvider + printfn "%s" (Control.Describe()) printfn "DC=%f; Low=%f; Hight=%f" vector.[0].Magnitude vector.[1].Magnitude vector.[5].Magnitude if Debugger.IsAttached then diff --git a/examples/net45-console-fsharp/net45-console-fsharp.fsproj b/examples/net45-console-fsharp/net45-console-fsharp.fsproj index 7ef993c7..25fa6906 100644 --- a/examples/net45-console-fsharp/net45-console-fsharp.fsproj +++ b/examples/net45-console-fsharp/net45-console-fsharp.fsproj @@ -12,7 +12,8 @@ v4.5 true true - 4.4.1.0 + 4.4.3.0 + 4.3.3 net45-console-fsharp @@ -64,23 +65,19 @@ - packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll + packages\FSharp.Core.4.3.3\lib\net45\FSharp.Core.dll - packages\MathNet.Numerics.4.0.0-beta05\lib\net40\MathNet.Numerics.dll + packages\MathNet.Numerics.4.0.0\lib\net40\MathNet.Numerics.dll - packages\MathNet.Numerics.FSharp.4.0.0-beta05\lib\net45\MathNet.Numerics.FSharp.dll + packages\MathNet.Numerics.FSharp.4.0.0\lib\net45\MathNet.Numerics.FSharp.dll - - packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - True - @@ -89,11 +86,11 @@ - - \ No newline at end of file + diff --git a/examples/net45-console-fsharp/packages.config b/examples/net45-console-fsharp/packages.config index b5cf9f23..0e07e2d0 100644 --- a/examples/net45-console-fsharp/packages.config +++ b/examples/net45-console-fsharp/packages.config @@ -1,8 +1,7 @@  - - - + + + - - \ No newline at end of file + diff --git a/examples/net471-console-csharp/Program.cs b/examples/net471-console-csharp/Program.cs index c07d2897..6df1d526 100644 --- a/examples/net471-console-csharp/Program.cs +++ b/examples/net471-console-csharp/Program.cs @@ -1,8 +1,6 @@ using System; using System.Diagnostics; using System.Numerics; -using System.Runtime.InteropServices; - using MathNet.Numerics; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.LinearAlgebra; @@ -18,8 +16,7 @@ namespace Integration Matrix matrix = CreateMatrix.Random(10, 10, 100); Vector vector = matrix.Svd().S; Fourier.Forward(vector.AsArray()); - Console.WriteLine($"Framework={RuntimeInformation.FrameworkDescription}; OS={RuntimeInformation.OSDescription}"); - Console.WriteLine($"LinearAlgebra={Control.LinearAlgebraProvider}; FFT={Control.FourierTransformProvider}"); + Console.WriteLine(Control.Describe()); Console.WriteLine($"DC={vector[0].Magnitude}; Low={vector[1].Magnitude}; Hight={vector[5].Magnitude}"); if (Debugger.IsAttached) diff --git a/examples/net471-console-csharp/net471-console-csharp.csproj b/examples/net471-console-csharp/net471-console-csharp.csproj index 51885cca..81e31f27 100644 --- a/examples/net471-console-csharp/net471-console-csharp.csproj +++ b/examples/net471-console-csharp/net471-console-csharp.csproj @@ -50,11 +50,11 @@ - 4.0.0-beta05 + 4.0.0 2.2.0 - \ No newline at end of file + diff --git a/examples/net471-console-fsharp/Program.fs b/examples/net471-console-fsharp/Program.fs index dd7f0aca..2809cf4f 100644 --- a/examples/net471-console-fsharp/Program.fs +++ b/examples/net471-console-fsharp/Program.fs @@ -1,7 +1,5 @@ open System open System.Diagnostics -open System.Runtime.InteropServices - open MathNet.Numerics open MathNet.Numerics.IntegralTransforms open MathNet.Numerics.LinearAlgebra @@ -16,8 +14,7 @@ let main argv = let matrix : Matrix = DenseMatrix.randomSeed 10 10 100 let vector = (matrix |> Matrix.svd).S vector.AsArray() |> Fourier.Forward - printfn "Framework=%s; OS=%s" RuntimeInformation.FrameworkDescription RuntimeInformation.OSDescription - printfn "LinearAlgebra=%O; FFT=%O" Control.LinearAlgebraProvider Control.FourierTransformProvider + printfn "%s" (Control.Describe()) printfn "DC=%f; Low=%f; Hight=%f" vector.[0].Magnitude vector.[1].Magnitude vector.[5].Magnitude if Debugger.IsAttached then diff --git a/examples/net471-console-fsharp/net471-console-fsharp.fsproj b/examples/net471-console-fsharp/net471-console-fsharp.fsproj index 08ed6087..435314b0 100644 --- a/examples/net471-console-fsharp/net471-console-fsharp.fsproj +++ b/examples/net471-console-fsharp/net471-console-fsharp.fsproj @@ -12,7 +12,8 @@ v4.7.1 true true - 4.4.1.0 + 4.4.3.0 + 4.3.3 net471-console-fsharp @@ -64,22 +65,19 @@ - packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll + packages\FSharp.Core.4.3.3\lib\net45\FSharp.Core.dll - packages\MathNet.Numerics.4.0.0-beta05\lib\net40\MathNet.Numerics.dll + packages\MathNet.Numerics.4.0.0\lib\net40\MathNet.Numerics.dll - packages\MathNet.Numerics.FSharp.4.0.0-beta05\lib\net45\MathNet.Numerics.FSharp.dll + packages\MathNet.Numerics.FSharp.4.0.0\lib\net45\MathNet.Numerics.FSharp.dll - - True - @@ -88,11 +86,11 @@ - - \ No newline at end of file + diff --git a/examples/net471-console-fsharp/packages.config b/examples/net471-console-fsharp/packages.config index 63c37788..6995a3ca 100644 --- a/examples/net471-console-fsharp/packages.config +++ b/examples/net471-console-fsharp/packages.config @@ -1,8 +1,7 @@  - - - + + + - \ No newline at end of file diff --git a/examples/netcore11-console-csharp/Program.cs b/examples/netcore11-console-csharp/Program.cs index 0871d593..6095a9e2 100644 --- a/examples/netcore11-console-csharp/Program.cs +++ b/examples/netcore11-console-csharp/Program.cs @@ -1,7 +1,5 @@ using System; using System.Diagnostics; -using System.Runtime.InteropServices; - using MathNet.Numerics; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.LinearAlgebra; @@ -19,8 +17,7 @@ namespace Integration Matrix matrix = CreateMatrix.Random(10, 10, 100); Vector vector = matrix.Svd().S; Fourier.Forward(vector.AsArray()); - Console.WriteLine($"Framework={RuntimeInformation.FrameworkDescription}; OS={RuntimeInformation.OSDescription}"); - Console.WriteLine($"LinearAlgebra={Control.LinearAlgebraProvider}; FFT={Control.FourierTransformProvider}"); + Console.WriteLine(Control.Describe()); Console.WriteLine($"DC={vector[0].Magnitude}; Low={vector[1].Magnitude}; Hight={vector[5].Magnitude}"); if (Debugger.IsAttached) diff --git a/examples/netcore11-console-csharp/netcore11-console-csharp.csproj b/examples/netcore11-console-csharp/netcore11-console-csharp.csproj index 0c214589..ee5e7ed0 100644 --- a/examples/netcore11-console-csharp/netcore11-console-csharp.csproj +++ b/examples/netcore11-console-csharp/netcore11-console-csharp.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/netcore11-console-fsharp/Program.fs b/examples/netcore11-console-fsharp/Program.fs index 47af4d2d..1000f85f 100644 --- a/examples/netcore11-console-fsharp/Program.fs +++ b/examples/netcore11-console-fsharp/Program.fs @@ -1,7 +1,5 @@ open System open System.Diagnostics -open System.Runtime.InteropServices - open MathNet.Numerics open MathNet.Numerics.IntegralTransforms open MathNet.Numerics.LinearAlgebra @@ -15,8 +13,7 @@ let main argv = let matrix : Matrix = DenseMatrix.randomSeed 10 10 100 let vector = (matrix |> Matrix.svd).S vector.AsArray() |> Fourier.Forward - printfn "Framework=%s; OS=%s" RuntimeInformation.FrameworkDescription RuntimeInformation.OSDescription - printfn "LinearAlgebra=%O; FFT=%O" Control.LinearAlgebraProvider Control.FourierTransformProvider + printfn "%s" (Control.Describe()) printfn "DC=%f; Low=%f; Hight=%f" vector.[0].Magnitude vector.[1].Magnitude vector.[5].Magnitude if Debugger.IsAttached then diff --git a/examples/netcore11-console-fsharp/netcore11-console-fsharp.fsproj b/examples/netcore11-console-fsharp/netcore11-console-fsharp.fsproj index e16f92ef..72079d72 100644 --- a/examples/netcore11-console-fsharp/netcore11-console-fsharp.fsproj +++ b/examples/netcore11-console-fsharp/netcore11-console-fsharp.fsproj @@ -3,6 +3,8 @@ Exe netcoreapp1.1 + 4.4.3.0 + 4.3.3 @@ -10,8 +12,16 @@ - - + + + + + + + + + + diff --git a/examples/netcore20-console-csharp/Program.cs b/examples/netcore20-console-csharp/Program.cs index 7a3d7b20..95ac44f8 100644 --- a/examples/netcore20-console-csharp/Program.cs +++ b/examples/netcore20-console-csharp/Program.cs @@ -1,7 +1,5 @@ using System; using System.Diagnostics; -using System.Runtime.InteropServices; - using MathNet.Numerics; using MathNet.Numerics.IntegralTransforms; using MathNet.Numerics.LinearAlgebra; @@ -19,8 +17,7 @@ namespace Integration Matrix matrix = CreateMatrix.Random(10, 10, 100); Vector vector = matrix.Svd().S; Fourier.Forward(vector.AsArray()); - Console.WriteLine($"Framework={RuntimeInformation.FrameworkDescription}; OS={RuntimeInformation.OSDescription}"); - Console.WriteLine($"LinearAlgebra={Control.LinearAlgebraProvider}; FFT={Control.FourierTransformProvider}"); + Console.WriteLine(Control.Describe()); Console.WriteLine($"DC={vector[0].Magnitude}; Low={vector[1].Magnitude}; Hight={vector[5].Magnitude}"); if (Debugger.IsAttached) diff --git a/examples/netcore20-console-csharp/netcore20-console-csharp.csproj b/examples/netcore20-console-csharp/netcore20-console-csharp.csproj index 63a799f6..2e62a932 100644 --- a/examples/netcore20-console-csharp/netcore20-console-csharp.csproj +++ b/examples/netcore20-console-csharp/netcore20-console-csharp.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/netcore20-console-fsharp/Program.fs b/examples/netcore20-console-fsharp/Program.fs index dd7f0aca..2809cf4f 100644 --- a/examples/netcore20-console-fsharp/Program.fs +++ b/examples/netcore20-console-fsharp/Program.fs @@ -1,7 +1,5 @@ open System open System.Diagnostics -open System.Runtime.InteropServices - open MathNet.Numerics open MathNet.Numerics.IntegralTransforms open MathNet.Numerics.LinearAlgebra @@ -16,8 +14,7 @@ let main argv = let matrix : Matrix = DenseMatrix.randomSeed 10 10 100 let vector = (matrix |> Matrix.svd).S vector.AsArray() |> Fourier.Forward - printfn "Framework=%s; OS=%s" RuntimeInformation.FrameworkDescription RuntimeInformation.OSDescription - printfn "LinearAlgebra=%O; FFT=%O" Control.LinearAlgebraProvider Control.FourierTransformProvider + printfn "%s" (Control.Describe()) printfn "DC=%f; Low=%f; Hight=%f" vector.[0].Magnitude vector.[1].Magnitude vector.[5].Magnitude if Debugger.IsAttached then diff --git a/examples/netcore20-console-fsharp/netcore20-console-fsharp.fsproj b/examples/netcore20-console-fsharp/netcore20-console-fsharp.fsproj index a2dc9463..20f598a8 100644 --- a/examples/netcore20-console-fsharp/netcore20-console-fsharp.fsproj +++ b/examples/netcore20-console-fsharp/netcore20-console-fsharp.fsproj @@ -3,6 +3,8 @@ Exe netcoreapp2.0 + 4.4.3.0 + 4.3.3 @@ -10,9 +12,13 @@ - - + + + + + +