Browse Source

Examples: update all examples to use v4.0.0

pull/555/merge
Christoph Ruegg 9 years ago
parent
commit
e1435e283e
  1. 2
      examples/examples-csharp/examples-csharp.csproj
  2. 8
      examples/examples-fsharp/examples-fsharp.fsproj
  3. 2
      examples/net45-console-csharp/Program.cs
  4. 2
      examples/net45-console-csharp/net45-console-csharp.csproj
  5. 3
      examples/net45-console-fsharp/Program.fs
  6. 17
      examples/net45-console-fsharp/net45-console-fsharp.fsproj
  7. 9
      examples/net45-console-fsharp/packages.config
  8. 5
      examples/net471-console-csharp/Program.cs
  9. 4
      examples/net471-console-csharp/net471-console-csharp.csproj
  10. 5
      examples/net471-console-fsharp/Program.fs
  11. 16
      examples/net471-console-fsharp/net471-console-fsharp.fsproj
  12. 7
      examples/net471-console-fsharp/packages.config
  13. 5
      examples/netcore11-console-csharp/Program.cs
  14. 2
      examples/netcore11-console-csharp/netcore11-console-csharp.csproj
  15. 5
      examples/netcore11-console-fsharp/Program.fs
  16. 14
      examples/netcore11-console-fsharp/netcore11-console-fsharp.fsproj
  17. 5
      examples/netcore20-console-csharp/Program.cs
  18. 2
      examples/netcore20-console-csharp/netcore20-console-csharp.csproj
  19. 5
      examples/netcore20-console-fsharp/Program.fs
  20. 10
      examples/netcore20-console-fsharp/netcore20-console-fsharp.fsproj

2
examples/examples-csharp/examples-csharp.csproj

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.0.0-beta06" />
<PackageReference Include="MathNet.Numerics" Version="4.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
<PackageReference Include="NETStandard.Library" Version="2.0.1" />

8
examples/examples-fsharp/examples-fsharp.fsproj

@ -3,6 +3,8 @@
<PropertyGroup>
<TargetFrameworks>net45;net46;netstandard1.6;netstandard2.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
<FSharpCoreImplicitPackageVersion>4.3.3</FSharpCoreImplicitPackageVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputType>Library</OutputType>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@ -22,9 +24,9 @@
<PackageReference Include="NETStandard.Library" Version="2.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.2.3" />
<PackageReference Include="MathNet.Numerics" Version="4.0.0-beta06" />
<PackageReference Include="MathNet.Numerics.FSharp" Version="4.0.0-beta06" />
<PackageReference Update="FSharp.Core" Version="4.3.3" />
<PackageReference Include="MathNet.Numerics" Version="4.0.0" />
<PackageReference Include="MathNet.Numerics.FSharp" Version="4.0.0" />
</ItemGroup>
</Project>

2
examples/net45-console-csharp/Program.cs

@ -17,7 +17,7 @@ namespace Integration
Matrix<Complex> matrix = CreateMatrix.Random<Complex>(10, 10, 100);
Vector<Complex> 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)

2
examples/net45-console-csharp/net45-console-csharp.csproj

@ -49,7 +49,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics">
<Version>4.0.0-beta05</Version>
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="MathNet.Numerics.MKL.Win">
<Version>2.2.0</Version>

3
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<Complex> = 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

17
examples/net45-console-fsharp/net45-console-fsharp.fsproj

@ -12,7 +12,8 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<UseStandardResourceNames>true</UseStandardResourceNames>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
<FSharpCoreImplicitPackageVersion>4.3.3</FSharpCoreImplicitPackageVersion>
<Name>net45-console-fsharp</Name>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
@ -64,23 +65,19 @@
</ItemGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>packages\FSharp.Core.4.3.3\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics">
<HintPath>packages\MathNet.Numerics.4.0.0-beta05\lib\net40\MathNet.Numerics.dll</HintPath>
<HintPath>packages\MathNet.Numerics.4.0.0\lib\net40\MathNet.Numerics.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics.FSharp">
<HintPath>packages\MathNet.Numerics.FSharp.4.0.0-beta05\lib\net45\MathNet.Numerics.FSharp.dll</HintPath>
<HintPath>packages\MathNet.Numerics.FSharp.4.0.0\lib\net45\MathNet.Numerics.FSharp.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ValueTuple">
<HintPath>packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<Import Project="packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets" Condition="Exists('packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@ -89,11 +86,11 @@
</PropertyGroup>
<Error Condition="!Exists('packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

9
examples/net45-console-fsharp/packages.config

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FSharp.Core" version="4.2.3" targetFramework="net45" />
<package id="MathNet.Numerics" version="4.0.0-beta05" targetFramework="net45" />
<package id="MathNet.Numerics.FSharp" version="4.0.0-beta05" targetFramework="net45" />
<package id="FSharp.Core" version="4.3.3" targetFramework="net45" />
<package id="MathNet.Numerics" version="4.0.0" targetFramework="net45" />
<package id="MathNet.Numerics.FSharp" version="4.0.0" targetFramework="net45" />
<package id="MathNet.Numerics.MKL.Win" version="2.2.0" targetFramework="net45" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net45" />
</packages>
</packages>

5
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<Complex> matrix = CreateMatrix.Random<Complex>(10, 10, 100);
Vector<Complex> 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)

4
examples/net471-console-csharp/net471-console-csharp.csproj

@ -50,11 +50,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics">
<Version>4.0.0-beta05</Version>
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="MathNet.Numerics.MKL.Win">
<Version>2.2.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>

5
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<Complex> = 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

16
examples/net471-console-fsharp/net471-console-fsharp.fsproj

@ -12,7 +12,8 @@
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<UseStandardResourceNames>true</UseStandardResourceNames>
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
<FSharpCoreImplicitPackageVersion>4.3.3</FSharpCoreImplicitPackageVersion>
<Name>net471-console-fsharp</Name>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
@ -64,22 +65,19 @@
</ItemGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<HintPath>packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll</HintPath>
<HintPath>packages\FSharp.Core.4.3.3\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics">
<HintPath>packages\MathNet.Numerics.4.0.0-beta05\lib\net40\MathNet.Numerics.dll</HintPath>
<HintPath>packages\MathNet.Numerics.4.0.0\lib\net40\MathNet.Numerics.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics.FSharp">
<HintPath>packages\MathNet.Numerics.FSharp.4.0.0-beta05\lib\net45\MathNet.Numerics.FSharp.dll</HintPath>
<HintPath>packages\MathNet.Numerics.FSharp.4.0.0\lib\net45\MathNet.Numerics.FSharp.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ValueTuple">
<Private>True</Private>
</Reference>
</ItemGroup>
<Import Project="packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets" Condition="Exists('packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@ -88,11 +86,11 @@
</PropertyGroup>
<Error Condition="!Exists('packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\MathNet.Numerics.MKL.Win.2.2.0\build\MathNet.Numerics.MKL.Win.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

7
examples/net471-console-fsharp/packages.config

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FSharp.Core" version="4.2.3" targetFramework="net471" />
<package id="MathNet.Numerics" version="4.0.0-beta05" targetFramework="net471" />
<package id="MathNet.Numerics.FSharp" version="4.0.0-beta05" targetFramework="net471" />
<package id="FSharp.Core" version="4.3.3" targetFramework="net471" />
<package id="MathNet.Numerics" version="4.0.0" targetFramework="net471" />
<package id="MathNet.Numerics.FSharp" version="4.0.0" targetFramework="net471" />
<package id="MathNet.Numerics.MKL.Win" version="2.2.0" targetFramework="net471" />
<package id="System.ValueTuple" version="4.3.1" targetFramework="net471" />
</packages>

5
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<Complex> matrix = CreateMatrix.Random<Complex>(10, 10, 100);
Vector<Complex> 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)

2
examples/netcore11-console-csharp/netcore11-console-csharp.csproj

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.0.0-beta05" />
<PackageReference Include="MathNet.Numerics" Version="4.0.0" />
</ItemGroup>
</Project>

5
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<Complex> = 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

14
examples/netcore11-console-fsharp/netcore11-console-fsharp.fsproj

@ -3,6 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
<FSharpCoreImplicitPackageVersion>4.3.3</FSharpCoreImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
@ -10,8 +12,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.0.0-beta05" />
<PackageReference Include="MathNet.Numerics.FSharp" Version="4.0.0-beta05" />
<PackageReference Include="MathNet.Numerics" Version="4.0.0" />
<PackageReference Include="MathNet.Numerics.FSharp" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.3.3" />
</ItemGroup>
</Project>

5
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<Complex> matrix = CreateMatrix.Random<Complex>(10, 10, 100);
Vector<Complex> 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)

2
examples/netcore20-console-csharp/netcore20-console-csharp.csproj

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.0.0-beta05" />
<PackageReference Include="MathNet.Numerics" Version="4.0.0" />
<PackageReference Include="MathNet.Numerics.MKL.Win" Version="2.2.0" />
</ItemGroup>

5
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<Complex> = 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

10
examples/netcore20-console-fsharp/netcore20-console-fsharp.fsproj

@ -3,6 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
<FSharpCoreImplicitPackageVersion>4.3.3</FSharpCoreImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
@ -10,9 +12,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.0.0-beta05" />
<PackageReference Include="MathNet.Numerics.FSharp" Version="4.0.0-beta05" />
<PackageReference Include="MathNet.Numerics" Version="4.0.0" />
<PackageReference Include="MathNet.Numerics.FSharp" Version="4.0.0" />
<PackageReference Include="MathNet.Numerics.MKL.Win" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.3.3" />
</ItemGroup>
</Project>

Loading…
Cancel
Save