Skip to content

Update Spike Detection ML.Net 2.0.1 .net7.0 v4.8 #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update Spike Detection ML.Net 2.0.1 .net7.0 v4.8 #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
455c81e
Update Spike Detection ML.Net 1.6 .net7.0 v4.8
Oct 24, 2023
7c60903
Update to ML.net 2.0.1
Oct 25, 2023
93d590b
update readme
Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/csharp/end-to-end-apps/AnomalyDetection-Sales/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

| ML.NET version | API type | Status | App Type | Data type | Scenario | ML Task | Algorithms |
|----------------|-------------------|-------------------------------|-------------|-----------|---------------------|---------------------------|-----------------------------|
| v1.4 | Dynamic API | Up-to-date | WinForms app | .csv files | Spike and Change Point Detection of Product Sales | Anomaly Detection | IID Spike Detection and IID Change point Detection |
| v2.0.1 | Dynamic API | Up-to-date | WinForms app | .csv files | Spike and Change Point Detection of Product Sales | Anomaly Detection | IID Spike Detection and IID Change point Detection |

![Alt Text](./SpikeDetectionE2EApp/SpikeDetection.WinForms/images/productsales.gif)

Expand Down
Binary file modified ...pps/AnomalyDetection-Sales/SpikeDetectionE2EApp/MLModels/ProductSalesChangePointModel.zip
View file
Open in desktop
Binary file not shown.
Binary file modified ...-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/MLModels/ProductSalesSpikeModel.zip
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions ...-Sales/SpikeDetectionE2EApp/SpikeDetection.ModelTrainer/SpikeDetectionModelTrainer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -16,8 +16,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="$(MicrosoftMLVersion)" />
<PackageReference Include="Microsoft.ML" Version="2.0.1" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="2.0.1" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...o-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/SpikeDetection.WinForms/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
6 changes: 3 additions & 3 deletions ...-to-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/SpikeDetection.WinForms/Form1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public partial class Form1 : Form
private string filePath = "";
Tuple<string, string> tup = null;
Dictionary<int, Tuple<string, string>> dict = new Dictionary<int, Tuple<string, string>>();
private static string BaseModelsRelativePath = @"../../../../MLModels";
private static string BaseModelsRelativePath = @"../../../MLModels";
private static string ModelRelativePath1 = $"{BaseModelsRelativePath}/ProductSalesSpikeModel.zip";
private static string ModelRelativePath2 = $"{BaseModelsRelativePath}/ProductSalesChangePointModel.zip";

Expand Down Expand Up @@ -112,8 +112,8 @@ private void displayDataTableAndGraph()

// Update y axis min and max values.
double yMax = Convert.ToDouble(dataTable.Compute($"max([{yAxis}])", string.Empty));
double yMin = Convert.ToDouble(dataTable.Compute($"min([{yAxis}])", string.Empty));

//double yMin = Convert.ToDouble(dataTable.Compute($"min([{yAxis}])", string.Empty));
double yMin = Convert.ToDouble(0);
// Set graph source.
graph.DataSource = dataTable;

Expand Down
29 changes: 3 additions & 26 deletions ...ction-Sales/SpikeDetectionE2EApp/SpikeDetection.WinForms/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 9 additions & 23 deletions ...ection-Sales/SpikeDetectionE2EApp/SpikeDetection.WinForms/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 15 additions & 13 deletions ...tection-Sales/SpikeDetectionE2EApp/SpikeDetection.WinForms/SpikeDetection.WinForms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
<OutputType>WinExe</OutputType>
<RootNamespace>AnomalyDetectionSample</RootNamespace>
<AssemblyName>AnomalyDetectionSample</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
Expand Down Expand Up @@ -90,6 +91,7 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand All @@ -106,43 +108,43 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ML">
<Version>$(MicrosoftMLVersion)</Version>
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.ML.CpuMath">
<Version>$(MicrosoftMLVersion)</Version>
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.ML.Mkl.Redist">
<Version>$(MicrosoftMLVersion)</Version>
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.ML.TimeSeries">
<Version>$(MicrosoftMLVersion)</Version>
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
<Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="System.Buffers">
<Version>4.5.0</Version>
<Version>4.5.1</Version>
</PackageReference>
<PackageReference Include="System.CodeDom">
<Version>4.6.0</Version>
<Version>7.0.0</Version>
</PackageReference>
<PackageReference Include="System.Collections.Immutable">
<Version>1.6.0</Version>
<Version>7.0.0</Version>
</PackageReference>
<PackageReference Include="System.Memory">
<Version>4.5.3</Version>
<Version>4.5.5</Version>
</PackageReference>
<PackageReference Include="System.Numerics.Vectors">
<Version>4.5.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit.Lightweight">
<Version>4.6.0</Version>
<Version>4.7.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
<Version>4.6.0</Version>
<Version>6.0.0</Version>
</PackageReference>
<PackageReference Include="System.Threading.Tasks.Dataflow">
<Version>4.10.0</Version>
<Version>7.0.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down