Converted e2e with tool

Author: Nukepayload2

samples/visualbasic/end-to-end-apps/AnomalyDetection-Sales/README.md

@@ -2,7 +2,7 @@
 
 | ML.NET version | API type          | Status                        | App Type    | Data type | Scenario            | ML Task                   | Algorithms                  |
 |----------------|-------------------|-------------------------------|-------------|-----------|---------------------|---------------------------|-----------------------------|
-| v1.1.0         | 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 |
+| v1.3.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)
 
@@ -29,7 +29,7 @@ Note: This app is written in .NET Framework, so you must manually restore the nu
     * Uses [IidSpikeDetector](https://docs.microsoft.com/dotnet/api/microsoft.ml.transforms.timeseries.iidspikedetector?view=ml-dotnet) and [IidChangePointDetector](https://docs.microsoft.com/dotnet/api/microsoft.ml.transforms.timeseries.iidchangepointdetector?view=ml-dotnet).
 
 ## Dataset
-We have created sample dataset for Product sales. The dataset `product-sales.csv` can be found [here](./Data/product-sales.csv)
+We have created sample dataset for Product sales. The dataset `product-sales.csv` can be found [here](./SpikeDetectionE2EApp/Data/product-sales.csv)
 
 Format of **Product Sales DataSet** looks like below.
 

samples/visualbasic/end-to-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/MLModels/ProductSalesChangePointModel.zip

@@ -18,6 +18,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="Microsoft.ML.TimeSeries" Version="$(MicrosoftMLPreviewVersion)" />
+    <PackageReference Include="Microsoft.ML.TimeSeries" Version="$(MicrosoftMLVersion)" />
   </ItemGroup>
 </Project>

samples/visualbasic/end-to-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/MLModels/ProductSalesSpikeModel.zip

@@ -126,16 +126,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.ML">
-      <Version>1.0.0-preview</Version>
+      <Version>$(MicrosoftMLVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.ML.CpuMath">
-      <Version>1.0.0-preview</Version>
+      <Version>$(MicrosoftMLVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.ML.Mkl.Redist">
-      <Version>1.0.0-preview</Version>
+      <Version>$(MicrosoftMLVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.ML.TimeSeries">
-      <Version>0.12.0-preview</Version>
+      <Version>$(MicrosoftMLVersion)</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>10.0.3</Version>

samples/visualbasic/end-to-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/SpikeDetection.ModelTrainer/SpikeDetectionModelTrainer.vbproj

@@ -2,20 +2,27 @@
 
 | ML.NET version | API type          | Status                        | App Type    | Data type | Scenario            | ML Task                   | Algorithms                  |
 |----------------|-------------------|-------------------------------|-------------|-----------|---------------------|---------------------------|-----------------------------|
-| v1.1.0           | Dynamic API | up-to-date | Console app | Images and text labels | Images classification | TensorFlow model  | DeepLearning model |
+| v1.3.1           | Dynamic API | up-to-date | Console app | Images and text labels | Images classification | TensorFlow model  | DeepLearning model |
 
 
 ## Problem
 The problem is how to run/score a TensorFlow model in a web app/service while using in-memory images. 
 
-## Solution:
+## Solution
 The model (`model.pb`) is trained using TensorFlow as disscussed in the blogpost [Run with ML.NET C# code a TensorFlow model exported from Azure Cognitive Services Custom Vision](https://devblogs.microsoft.com/cesardelatorre/run-with-ml-net-c-code-a-tensorflow-model-exported-from-azure-cognitive-services-custom-vision/).
 
-see the below architecture that shows how to run/score TensorFlow model in ASP.NET Core Razor web app/service
+See the below architecture that shows how to run/score TensorFlow model in ASP.NET Core Razor web app/service:
 
 ![](docs/scenario-architecture.png)
 
 
-The difference between [getting started sample](https://github.com/dotnet/machinelearning-samples/tree/master/samples/csharp/getting-started/DeepLearning_ImageClassification_TensorFlow) and this end-to-end sample is that the images are loaded from  **file** in getting started sample where as the images are loaded from **in-memory** in this end-to-end sample.
+The difference between the [getting started sample](https://github.com/dotnet/machinelearning-samples/tree/master/samples/csharp/getting-started/DeepLearning_ImageClassification_TensorFlow) and this end-to-end sample is that the images are loaded from  **file** in getting started sample whereas the images are loaded from **in-memory** in this end-to-end sample.
 
 **Note:**  this sample is trained using Custom images and it predicts the only specific images that are in [TestImages](./TestImages) Folder.
+
+## Fine-Tuning for Your Custom Model
+
+If you are using a custom trained TensorFlow model and getting low scores, you may need to [resize your input images](https://lutzroeder.github.io/netron/) and fine-tune some of the values in the [ImageSettings struct](https://github.com/dotnet/machinelearning-samples/blob/aaa490461b3d313d1dcd828eaf0bf4ced6609a16/samples/csharp/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/ML/TensorFlowModelConfigurator.cs#L22), such as the image size (imageHeight and imageWidth) and offset (mean). As you adjust these values, take note of how they affect scoring.
+
+You can review the [Run with ML.NET C# code a TensorFlow model exported from Azure Cognitive Services Custom Vision
+](https://devblogs.microsoft.com/cesardelatorre/run-with-ml-net-c-code-a-tensorflow-model-exported-from-azure-cognitive-services-custom-vision/) blogpost if you have any questions about meeting the needs of your model to get accurate predictions.

samples/visualbasic/end-to-end-apps/AnomalyDetection-Sales/SpikeDetectionE2EApp/SpikeDetection.WinForms/SpikeDetection.WinForms.vbproj

@@ -90,12 +90,10 @@ Namespace TensorFlowImageClassification.Controllers
 			'Set a single label as predicted or even none if probabilities were lower than 70%
 			Dim imageBestLabelPrediction = New ImagePredictedLabelWithProbability With {.ImageId = imageInputData.GetHashCode().ToString()}
 
-            With GetBestLabel(labels, probabilities)
-                imageBestLabelPrediction.PredictedLabel = .Item1
-                imageBestLabelPrediction.Probability = .Item2
-            End With
+'INSTANT VB TODO TASK: VB has no equivalent to the C# deconstruction assignments:
+			(imageBestLabelPrediction.PredictedLabel, imageBestLabelPrediction.Probability) = GetBestLabel(labels, probabilities)
 
-            Return imageBestLabelPrediction
+			Return imageBestLabelPrediction
 		End Function
 
 		Private Function GetBestLabel(labels() As String, probs() As Single) As (String, Single)
@@ -124,7 +122,7 @@ Namespace TensorFlowImageClassification.Controllers
 		' GET api/ImageClassification
 		<HttpGet>
 		Public Function [Get]() As ActionResult(Of IEnumerable(Of String))
-            Return New ActionResult(Of IEnumerable(Of String))({"ACK Heart beat 1", "ACK Heart beat 2"})
-        End Function
+			Return New String() { "ACK Heart beat 1", "ACK Heart beat 2" }
+		End Function
 	End Class
 End Namespace

samples/visualbasic/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/README.md

@@ -0,0 +1,24 @@
+Imports Microsoft.Extensions.ML
+Imports Microsoft.Extensions.Primitives
+Imports Microsoft.ML
+Imports System.Threading
+
+Namespace TensorFlowImageClassification.ML
+	Public Class InMemoryModelLoader
+		Inherits ModelLoader
+
+		Private ReadOnly _model As ITransformer
+
+		Public Sub New(model As ITransformer)
+			_model = model
+		End Sub
+
+		Public Overrides Function GetModel() As ITransformer
+			Return _model
+		End Function
+
+		Public Overrides Function GetReloadToken() As IChangeToken
+			Return New CancellationChangeToken(CancellationToken.None)
+		End Function
+	End Class
+End Namespace

samples/visualbasic/end-to-end-apps/DeepLearning_ImageClassification_TensorFlow/TensorFlowImageClassification/Controllers/ImageClassificationController.vb

@@ -1,21 +1,19 @@
 Imports Microsoft.ML
-Imports System
 Imports System.Collections.Generic
-Imports System.IO
 Imports System.Linq
-Imports System.Threading.Tasks
 Imports TensorFlowImageClassification.ML.DataModels
 
 Namespace TensorFlowImageClassification.ML
 	Public Class TensorFlowModelConfigurator
 		Private ReadOnly _mlContext As MLContext
-		Private ReadOnly _mlModel As ITransformer
+
+		Public ReadOnly Property Model As ITransformer
 
 		Public Sub New(tensorFlowModelFilePath As String)
 			_mlContext = New MLContext
 
 			' Model creation and pipeline definition for images needs to run just once, so calling it from the constructor:
-			_mlModel = SetupMlnetModel(tensorFlowModelFilePath)
+			Model = SetupMlnetModel(tensorFlowModelFilePath)
 		End Sub
 
 		Public Structure ImageSettings
@@ -50,10 +48,5 @@ Namespace TensorFlowImageClassification.ML
 			Dim dv = _mlContext.Data.LoadFromEnumerable(Of ImageInputData)(list)
 			Return dv
 		End Function
-
-		Public Sub SaveMLNetModel(mlnetModelFilePath As String)
-			' Save/persist the model to a .ZIP file to be loaded by the PredictionEnginePool
-			_mlContext.Model.Save(_mlModel, Nothing, mlnetModelFilePath)
-		End Sub
 	End Class
 End Namespace