From d9182525bf7d44b61bc51d6729c510a6a0abebc2 Mon Sep 17 00:00:00 2001 From: Justin Ormont Date: Mon, 22 Apr 2019 00:41:24 -0700 Subject: [PATCH 1/2] CLI CodeGen printing L1 instead of RMS --- src/mlnet/Templates/Console/ModelBuilder.tt | 2 +- ...nsoleAppModelBuilderCSFileContentRegressionTest.approved.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mlnet/Templates/Console/ModelBuilder.tt b/src/mlnet/Templates/Console/ModelBuilder.tt index f2f0240369..fbc2beef44 100644 --- a/src/mlnet/Templates/Console/ModelBuilder.tt +++ b/src/mlnet/Templates/Console/ModelBuilder.tt @@ -188,7 +188,7 @@ else{#> { var L1 = crossValidationResults.Select(r => r.Metrics.MeanAbsoluteError); var L2 = crossValidationResults.Select(r => r.Metrics.MeanSquaredError); - var RMS = crossValidationResults.Select(r => r.Metrics.MeanAbsoluteError); + var RMS = crossValidationResults.Select(r => r.Metrics.RootMeanSquaredError); var lossFunction = crossValidationResults.Select(r => r.Metrics.LossFunction); var R2 = crossValidationResults.Select(r => r.Metrics.RSquared); diff --git a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt index 8211bd7e61..53a78e05b3 100644 --- a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt +++ b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt @@ -119,7 +119,7 @@ namespace TestNamespace.ConsoleApp { var L1 = crossValidationResults.Select(r => r.Metrics.MeanAbsoluteError); var L2 = crossValidationResults.Select(r => r.Metrics.MeanSquaredError); - var RMS = crossValidationResults.Select(r => r.Metrics.MeanAbsoluteError); + var RMS = crossValidationResults.Select(r => r.Metrics.RootMeanSquaredError); var lossFunction = crossValidationResults.Select(r => r.Metrics.LossFunction); var R2 = crossValidationResults.Select(r => r.Metrics.RSquared); From ffbd09a11dd0d0985fe3306e8827b43192720811 Mon Sep 17 00:00:00 2001 From: Justin Ormont Date: Mon, 22 Apr 2019 00:51:44 -0700 Subject: [PATCH 2/2] Format output metrics --- src/mlnet/Templates/Console/ModelBuilder.tt | 8 ++++---- ...ppModelBuilderCSFileContentRegressionTest.approved.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mlnet/Templates/Console/ModelBuilder.tt b/src/mlnet/Templates/Console/ModelBuilder.tt index fbc2beef44..cf0c7346fc 100644 --- a/src/mlnet/Templates/Console/ModelBuilder.tt +++ b/src/mlnet/Templates/Console/ModelBuilder.tt @@ -195,11 +195,11 @@ else{#> Console.WriteLine($"*************************************************************************************************************"); Console.WriteLine($"* Metrics for Regression model "); Console.WriteLine($"*------------------------------------------------------------------------------------------------------------"); - Console.WriteLine($"* Average L1 Loss: {L1.Average():0.###} "); - Console.WriteLine($"* Average L2 Loss: {L2.Average():0.###} "); - Console.WriteLine($"* Average RMS: {RMS.Average():0.###} "); + Console.WriteLine($"* Average L1 Loss: {L1.Average():0.###} "); + Console.WriteLine($"* Average L2 Loss: {L2.Average():0.###} "); + Console.WriteLine($"* Average RMS: {RMS.Average():0.###} "); Console.WriteLine($"* Average Loss Function: {lossFunction.Average():0.###} "); - Console.WriteLine($"* Average R-squared: {R2.Average():0.###} "); + Console.WriteLine($"* Average R-squared: {R2.Average():0.###} "); Console.WriteLine($"*************************************************************************************************************"); } <# } if("BinaryClassification".Equals(TaskType)){ #> diff --git a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt index 53a78e05b3..7f71a0b7d5 100644 --- a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt +++ b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppModelBuilderCSFileContentRegressionTest.approved.txt @@ -126,11 +126,11 @@ namespace TestNamespace.ConsoleApp Console.WriteLine($"*************************************************************************************************************"); Console.WriteLine($"* Metrics for Regression model "); Console.WriteLine($"*------------------------------------------------------------------------------------------------------------"); - Console.WriteLine($"* Average L1 Loss: {L1.Average():0.###} "); - Console.WriteLine($"* Average L2 Loss: {L2.Average():0.###} "); - Console.WriteLine($"* Average RMS: {RMS.Average():0.###} "); + Console.WriteLine($"* Average L1 Loss: {L1.Average():0.###} "); + Console.WriteLine($"* Average L2 Loss: {L2.Average():0.###} "); + Console.WriteLine($"* Average RMS: {RMS.Average():0.###} "); Console.WriteLine($"* Average Loss Function: {lossFunction.Average():0.###} "); - Console.WriteLine($"* Average R-squared: {R2.Average():0.###} "); + Console.WriteLine($"* Average R-squared: {R2.Average():0.###} "); Console.WriteLine($"*************************************************************************************************************"); } }