From 430a999ec9d0f24d960a93580083c996a4db158b Mon Sep 17 00:00:00 2001 From: Zeeshan Ahmed Date: Fri, 29 Mar 2019 11:16:47 -0700 Subject: [PATCH 1/3] Updating .tt file due to renaming of LbfgsPoissonRegression. --- .../{PoissonRegression.cs => LbfgsPoissonRegression.cs} | 4 ++-- .../{PoissonRegression.tt => LbfgsPoissonRegression.tt} | 4 ++-- .../Microsoft.ML.Samples/Microsoft.ML.Samples.csproj | 8 ++++---- .../StandardTrainersCatalog.cs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/{PoissonRegression.cs => LbfgsPoissonRegression.cs} (98%) rename docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/{PoissonRegression.tt => LbfgsPoissonRegression.tt} (87%) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegression.cs similarity index 98% rename from docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegression.cs rename to docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegression.cs index 44565c783e..c9f3d83faa 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegression.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegression.cs @@ -5,7 +5,7 @@ namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression { - public static class PoissonRegression + public static class LbfgsPoissonRegression { public static void Example() { @@ -49,7 +49,7 @@ public static void Example() // Evaluate the overall metrics var metrics = mlContext.Regression.Evaluate(transformedTestData); SamplesUtils.ConsoleUtils.PrintMetrics(metrics); - + // Expected output: // Mean Absolute Error: 0.07 // Mean Squared Error: 0.01 diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegression.tt b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegression.tt similarity index 87% rename from docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegression.tt rename to docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegression.tt index 94ab1692db..1a20da0737 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegression.tt +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegression.tt @@ -1,8 +1,8 @@ <#@ include file="RegressionSamplesTemplate.ttinclude"#> <#+ -string ClassName="PoissonRegression"; -string Trainer = "PoissonRegression"; +string ClassName="LbfgsPoissonRegression"; +string Trainer = "LbfgsPoissonRegression"; string TrainerOptions = null; string ExpectedOutputPerInstance= @"// Expected output: diff --git a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj index 8d83cc95bd..6041f22566 100644 --- a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj +++ b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj @@ -98,9 +98,9 @@ TextTemplatingFileGenerator OnlineGradientDescentWithOptions.cs - + TextTemplatingFileGenerator - PoissonRegression.cs + LbfgsPoissonRegression.cs TextTemplatingFileGenerator @@ -153,10 +153,10 @@ True OnlineGradientDescentWithOptions.tt - + True True - PoissonRegression.tt + LbfgsPoissonRegression.tt True diff --git a/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs b/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs index 76b963d6cf..e3740cf826 100644 --- a/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs +++ b/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs @@ -567,7 +567,7 @@ public static LbfgsLogisticRegressionBinaryTrainer LbfgsLogisticRegression(this /// /// /// /// public static LbfgsPoissonRegressionTrainer LbfgsPoissonRegression(this RegressionCatalog.RegressionTrainers catalog, From aa4ee4a481299fcbef9163d0731f52329eee1c73 Mon Sep 17 00:00:00 2001 From: Zeeshan Ahmed Date: Mon, 1 Apr 2019 10:27:53 -0700 Subject: [PATCH 2/3] Addressed reviewers' comments. --- ...ithOptions.cs => LbfgsPoissonRegressionWithOptions.cs} | 4 ++-- ...ithOptions.tt => LbfgsPoissonRegressionWithOptions.tt} | 6 +++--- .../Microsoft.ML.Samples/Microsoft.ML.Samples.csproj | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) rename docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/{PoissonRegressionWithOptions.cs => LbfgsPoissonRegressionWithOptions.cs} (98%) rename docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/{PoissonRegressionWithOptions.tt => LbfgsPoissonRegressionWithOptions.tt} (85%) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegressionWithOptions.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegressionWithOptions.cs similarity index 98% rename from docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegressionWithOptions.cs rename to docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegressionWithOptions.cs index 53c3422b07..ea1bd79888 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegressionWithOptions.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegressionWithOptions.cs @@ -6,7 +6,7 @@ namespace Microsoft.ML.Samples.Dynamic.Trainers.Regression { - public static class PoissonRegressionWithOptions + public static class LbfgsPoissonRegressionWithOptions { public static void Example() { @@ -61,7 +61,7 @@ public static void Example() // Evaluate the overall metrics var metrics = mlContext.Regression.Evaluate(transformedTestData); SamplesUtils.ConsoleUtils.PrintMetrics(metrics); - + // Expected output: // Mean Absolute Error: 0.07 // Mean Squared Error: 0.01 diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegressionWithOptions.tt b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegressionWithOptions.tt similarity index 85% rename from docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegressionWithOptions.tt rename to docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegressionWithOptions.tt index e643d95a07..9db6fe6567 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/PoissonRegressionWithOptions.tt +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/Regression/LbfgsPoissonRegressionWithOptions.tt @@ -1,9 +1,9 @@ <#@ include file="RegressionSamplesTemplate.ttinclude"#> <#+ -string ClassName="PoissonRegressionWithOptions"; -string Trainer = "PoissonRegression"; -string TrainerOptions = @"PoissonRegressionTrainer.Options +string ClassName="LbfgsPoissonRegressionWithOptions"; +string Trainer = "LbfgsPoissonRegression"; +string TrainerOptions = @"LbfgsPoissonRegressionTrainer.Options { // Reduce optimization tolerance to speed up training at the cost of accuracy. OptmizationTolerance = 1e-4f, diff --git a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj index 6041f22566..7cb766c6de 100644 --- a/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj +++ b/docs/samples/Microsoft.ML.Samples/Microsoft.ML.Samples.csproj @@ -102,9 +102,9 @@ TextTemplatingFileGenerator LbfgsPoissonRegression.cs - + TextTemplatingFileGenerator - PoissonRegressionWithOptions.cs + LbfgsPoissonRegressionWithOptions.cs @@ -158,10 +158,10 @@ True LbfgsPoissonRegression.tt - + True True - PoissonRegressionWithOptions.tt + LbfgsPoissonRegressionWithOptions.tt From bb207c1a574d657a0eab18b32f31e888ff3dfba7 Mon Sep 17 00:00:00 2001 From: Zeeshan Ahmed Date: Mon, 1 Apr 2019 10:30:19 -0700 Subject: [PATCH 3/3] Addressed reviewers' comments. --- src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs b/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs index e3740cf826..a65b2e0cd9 100644 --- a/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs +++ b/src/Microsoft.ML.StandardTrainers/StandardTrainersCatalog.cs @@ -593,7 +593,7 @@ public static LbfgsPoissonRegressionTrainer LbfgsPoissonRegression(this Regressi /// /// /// /// public static LbfgsPoissonRegressionTrainer LbfgsPoissonRegression(this RegressionCatalog.RegressionTrainers catalog, LbfgsPoissonRegressionTrainer.Options options)