Skip to content

Commit

Permalink
Merge pull request #146 from cbovar/Upgrade_Framework
Browse files Browse the repository at this point in the history
Upgrade framework
  • Loading branch information
cbovar authored Feb 12, 2020
2 parents 24588a5 + 79691e2 commit 2a42097
Show file tree
Hide file tree
Showing 202 changed files with 136,152 additions and 5,577 deletions.
10 changes: 2 additions & 8 deletions ConvNetSharp.Nuget.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.14
# Visual Studio Version 16
VisualStudioVersion = 16.0.29728.190
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume", "src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj", "{1A285120-F2F0-4A94-AB31-B4E870679C0E}"
EndProject
Expand All @@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.GPU.Nug
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Flow.Nuget", "src\ConvNetSharp.Flow\ConvNetSharp.Flow.Nuget.csproj", "{33F6F287-80DC-4E94-854A-501B65D4CD15}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Utils.Nuget", "src\ConvNetSharp.Utils\ConvNetSharp.Utils.Nuget.csproj", "{64DB0F34-099A-41F8-A9D5-E58DD66A1276}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -35,10 +33,6 @@ Global
{33F6F287-80DC-4E94-854A-501B65D4CD15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33F6F287-80DC-4E94-854A-501B65D4CD15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33F6F287-80DC-4E94-854A-501B65D4CD15}.Release|Any CPU.Build.0 = Release|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
40 changes: 17 additions & 23 deletions ConvNetSharp.sln
Original file line number Diff line number Diff line change
@@ -1,49 +1,47 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.14
# Visual Studio Version 16
VisualStudioVersion = 16.0.29728.190
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{52D65A64-6583-4C2B-A41B-009A739CCC80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Classify2DDemo", "Examples\Classify2DDemo\Classify2DDemo.csproj", "{2A9533F5-F706-4170-9E57-B7DCFFD6C168}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Classify2DDemo", "Examples\Classify2DDemo\Classify2DDemo.csproj", "{2A9533F5-F706-4170-9E57-B7DCFFD6C168}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Core.Tests", "src\ConvNetSharp.Core.Tests\ConvNetSharp.Core.Tests.csproj", "{507EE568-0C1E-451D-851E-4FB2D96B9E5F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Core.Tests", "src\ConvNetSharp.Core.Tests\ConvNetSharp.Core.Tests.csproj", "{507EE568-0C1E-451D-851E-4FB2D96B9E5F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.GPU", "src\ConvNetSharp.Volume.GPU\ConvNetSharp.Volume.GPU.csproj", "{608C97DB-721F-4B34-BE2D-01A85B762BE9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Volume.GPU.Tests", "src\ConvNetSharp.Volume.GPU.Tests\ConvNetSharp.Volume.GPU.Tests.csproj", "{1A149F93-71AF-4D84-A9A2-16B2A580D3F7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.GPU.Tests", "src\ConvNetSharp.Volume.GPU.Tests\ConvNetSharp.Volume.GPU.Tests.csproj", "{1A149F93-71AF-4D84-A9A2-16B2A580D3F7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Volume.Tests", "src\ConvNetSharp.Volume.Tests\ConvNetSharp.Volume.Tests.csproj", "{45892049-C55F-411B-9E4C-6240CA6CAC39}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume.Tests", "src\ConvNetSharp.Volume.Tests\ConvNetSharp.Volume.Tests.csproj", "{45892049-C55F-411B-9E4C-6240CA6CAC39}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinimalExample", "Examples\MinimalExample\MinimalExample.csproj", "{4EF98185-F653-4CD3-AF58-77D036CB6A1F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalExample", "Examples\MinimalExample\MinimalExample.csproj", "{4EF98185-F653-4CD3-AF58-77D036CB6A1F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Volume", "src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj", "{1A285120-F2F0-4A94-AB31-B4E870679C0E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Core", "src\ConvNetSharp.Core\ConvNetSharp.Core.csproj", "{3A6864AF-30B4-4C0E-B621-3571E3D88B43}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentMnistDemo", "Examples\FluentMnistDemo\FluentMnistDemo.csproj", "{47ECFF06-58BF-4396-874F-C66AC552705B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentMnistDemo", "Examples\FluentMnistDemo\FluentMnistDemo.csproj", "{47ECFF06-58BF-4396-874F-C66AC552705B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MnistDemo", "Examples\MnistDemo\MnistDemo.csproj", "{CD073D54-06AC-46E2-BC9C-BB03BC98EC14}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MnistDemo", "Examples\MnistDemo\MnistDemo.csproj", "{CD073D54-06AC-46E2-BC9C-BB03BC98EC14}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MnitsDemo.GPU", "Examples\MnistDemo.GPU\MnitsDemo.GPU.csproj", "{1C5D92A1-272A-4545-BE0D-B4F836861E04}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MnitsDemo.GPU", "Examples\MnistDemo.GPU\MnitsDemo.GPU.csproj", "{1C5D92A1-272A-4545-BE0D-B4F836861E04}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Performance.Tests", "src\ConvNetSharp.Performance.Tests\ConvNetSharp.Performance.Tests.csproj", "{857A7B91-A10B-484D-9164-0850734A4583}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Performance.Tests", "src\ConvNetSharp.Performance.Tests\ConvNetSharp.Performance.Tests.csproj", "{857A7B91-A10B-484D-9164-0850734A4583}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MnistDemo.Flow.GPU", "Examples\MnistDemo.Flow.GPU\MnistDemo.Flow.GPU.csproj", "{01773087-8E8F-400E-AE7E-891D9764003D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MnistDemo.Flow.GPU", "Examples\MnistDemo.Flow.GPU\MnistDemo.Flow.GPU.csproj", "{01773087-8E8F-400E-AE7E-891D9764003D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Flow", "src\ConvNetSharp.Flow\ConvNetSharp.Flow.csproj", "{54F7C4CA-B059-46DF-A766-E08515060393}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Flow.Tests", "src\ConvNetSharp.Flow.Tests\ConvNetSharp.Flow.Tests.csproj", "{172EE640-933C-45C2-9F5F-E55CAF37062E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvNetSharp.Flow.Tests", "src\ConvNetSharp.Flow.Tests\ConvNetSharp.Flow.Tests.csproj", "{172EE640-933C-45C2-9F5F-E55CAF37062E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvNetSharp.Utils", "src\ConvNetSharp.Utils\ConvNetSharp.Utils.csproj", "{64DB0F34-099A-41F8-A9D5-E58DD66A1276}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FlowDemo", "Examples\FlowDemo\FlowDemo.csproj", "{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlowDemo", "Examples\FlowDemo\FlowDemo.csproj", "{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaveAndLoadDemo", "Examples\SaveAndLoadDemo\SaveAndLoadDemo.csproj", "{ED370E1C-BCE9-403D-8AD9-19015381C2F3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveAndLoadDemo", "Examples\SaveAndLoadDemo\SaveAndLoadDemo.csproj", "{ED370E1C-BCE9-403D-8AD9-19015381C2F3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaveAndLoadDemo.Flow", "Examples\SaveAndLoadDemo.Flow\SaveAndLoadDemo.Flow.csproj", "{09169583-B94A-4E16-9F94-414DF9361834}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveAndLoadDemo.Flow", "Examples\SaveAndLoadDemo.Flow\SaveAndLoadDemo.Flow.csproj", "{09169583-B94A-4E16-9F94-414DF9361834}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RnnDemo.Flow.GPU", "Examples\RnnDemo.Flow\RnnDemo.Flow.GPU.csproj", "{038BDB21-6368-4BB5-9AF3-DB9FAE9375B8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RnnDemo.Flow.GPU", "Examples\RnnDemo.Flow\RnnDemo.Flow.GPU.csproj", "{038BDB21-6368-4BB5-9AF3-DB9FAE9375B8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -111,10 +109,6 @@ Global
{172EE640-933C-45C2-9F5F-E55CAF37062E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{172EE640-933C-45C2-9F5F-E55CAF37062E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{172EE640-933C-45C2-9F5F-E55CAF37062E}.Release|Any CPU.Build.0 = Release|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64DB0F34-099A-41F8-A9D5-E58DD66A1276}.Release|Any CPU.Build.0 = Release|Any CPU
{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DAFB991-F930-4E9C-9E87-CB22F526EE8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
9 changes: 9 additions & 0 deletions ConvNetSharp.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=Blas/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cuda/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Cudnn/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=graphml/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Implem/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Relu/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Softmax/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Tanh/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion Examples/Classify2DDemo/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
71 changes: 14 additions & 57 deletions Examples/Classify2DDemo/Classify2DDemo.csproj
Original file line number Diff line number Diff line change
@@ -1,64 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2A9533F5-F706-4170-9E57-B7DCFFD6C168}</ProjectGuid>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<StartupObject>Classify2DDemo.Program</StartupObject>
<ApplicationIcon />
<OutputType>Exe</OutputType>
<RootNamespace>Classify2DDemo</RootNamespace>
<AssemblyName>Classify2DDemo</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\ConvNetSharp.Core\ConvNetSharp.Core.csproj">
<Project>{3a6864af-30b4-4c0e-b621-3571e3d88b43}</Project>
<Name>ConvNetSharp.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj">
<Project>{1a285120-f2f0-4a94-ab31-b4e870679c0e}</Project>
<Name>ConvNetSharp.Volume</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\ConvNetSharp.Core\ConvNetSharp.Core.csproj" />
<ProjectReference Include="..\..\src\ConvNetSharp.Volume\ConvNetSharp.Volume.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />


</Project>
36 changes: 0 additions & 36 deletions Examples/Classify2DDemo/Properties/AssemblyInfo.cs

This file was deleted.

6 changes: 0 additions & 6 deletions Examples/FlowDemo/App.config

This file was deleted.

9 changes: 4 additions & 5 deletions Examples/FlowDemo/Classify2DDemo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using ConvNetSharp.Flow;
using ConvNetSharp.Flow.Layers;
using ConvNetSharp.Flow.Training;
using ConvNetSharp.Utils.GraphVisualizer;
using ConvNetSharp.Volume;
using ConvNetSharp.Volume.Double;

Expand Down Expand Up @@ -63,10 +62,10 @@ public static void Classify2DDemo()
Classify2DUpdate(n, data, trainer, labels);
} while (!Console.KeyAvailable);

// Display graph
var vm = new ViewModel<double>(net.Cost);
var app = new Application();
app.Run(new GraphControl { DataContext = vm });
//// Display graph
//var vm = new ViewModel<double>(net.Cost);
//var app = new Application();
//app.Run(new GraphControl { DataContext = vm });

net.Dispose();
trainer.Dispose();
Expand Down
10 changes: 4 additions & 6 deletions Examples/FlowDemo/ExampleCPUDouble.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using ConvNetSharp.Flow;
using ConvNetSharp.Flow.Training;
using ConvNetSharp.Utils.GraphVisualizer;
using ConvNetSharp.Volume;

namespace FlowDemo
Expand Down Expand Up @@ -91,10 +89,10 @@ public static void Example2()
} while (currentCost > 1e-5);
}

// Display derivate at b
var vm = new ViewModel<double>(b.Derivate);
var app = new Application();
app.Run(new GraphControl { DataContext = vm });
//// Display derivate at b
//var vm = new ViewModel<double>(b.Derivate);
//var app = new Application();
//app.Run(new GraphControl { DataContext = vm });

double finalb = b.Result;
Console.WriteLine($"fun = x + {finalb}");
Expand Down
26 changes: 12 additions & 14 deletions Examples/FlowDemo/ExampleCPUSingle.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Windows;
using ConvNetSharp.Flow;
using ConvNetSharp.Flow.Ops;
using ConvNetSharp.Flow.Serialization;
using ConvNetSharp.Flow.Training;
using ConvNetSharp.Utils.GraphVisualizer;
using ConvNetSharp.Volume;

namespace FlowDemo
Expand Down Expand Up @@ -72,10 +70,10 @@ public static void Example1()

fun.Save("test", cost);

// Display graph
var vm = new ViewModel<float>(cost);
var app = new Application();
app.Run(new GraphControl { DataContext = vm });
//// Display graph
//var vm = new ViewModel<float>(cost);
//var app = new Application();
//app.Run(new GraphControl { DataContext = vm });
}

Console.ReadKey();
Expand All @@ -96,10 +94,10 @@ public static void Example2()
{
session.Differentiate(fun); // computes dCost/dW at every node of the graph

// Display graph
var vm = new ViewModel<float>(x.Derivate);
var app = new Application();
app.Run(new GraphControl { DataContext = vm });
//// Display graph
//var vm = new ViewModel<float>(x.Derivate);
//var app = new Application();
//app.Run(new GraphControl { DataContext = vm });
}

Console.ReadKey();
Expand Down Expand Up @@ -129,10 +127,10 @@ public static void Example3()

} while (!Console.KeyAvailable);

// Display graph
var vm = new ViewModel<float>(fun);
var app = new Application();
app.Run(new GraphControl { DataContext = vm });
//// Display graph
//var vm = new ViewModel<float>(fun);
//var app = new Application();
//app.Run(new GraphControl { DataContext = vm });
}
}
}
Expand Down
Loading

0 comments on commit 2a42097

Please sign in to comment.