From 1b0eed04eae74125d0689d4d140bc70e459b67a0 Mon Sep 17 00:00:00 2001 From: J W Date: Mon, 14 Jan 2019 22:59:31 -0500 Subject: [PATCH 01/10] Add binary logistic sample --- .../Dynamic/LogisticRegression.cs | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs new file mode 100644 index 0000000000..c177186f48 --- /dev/null +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Microsoft.ML.Data; + +namespace Microsoft.ML.Samples.Dynamic +{ + public class LogisticRegression_example + { + public static void LogisticRegression() + { + var ml = new MLContext(); + + // Downloading a classification dataset from github.com/dotnet/machinelearning. + // It will be stored in the same path as the executable + var dataFilePath = SamplesUtils.DatasetUtils.DownloadAdultDataset(); + + // Data Preview + // 1. Column [Label]: IsOver50K (boolean) + // 2. Column: workclass (text/categorical) + // 3. Column: education (text/categorical) + // 4. Column: marital-status (text/categorical) + // 5. Column: occupation (text/categorical) + // 6. Column: relationship (text/categorical) + // 7. Column: ethnicity (text/categorical) + // 8. Column: sex (text/categorical) + // 9. Column: native-country-region (text/categorical) + // 10. Column: age (numeric) + // 11. Column: fnlwgt (numeric) + // 12. Column: education-num (numeric) + // 13. Column: capital-gain (numeric) + // 14. Column: capital-loss (numeric) + // 15. Column: hours-per-week (numeric) + + var reader = ml.Data.CreateTextReader(new TextLoader.Arguments + { + Separator = ",", + HasHeader = true, + Column = new[] + { + new TextLoader.Column("Label", DataKind.Bool, 0), + new TextLoader.Column("workclass", DataKind.Text, 1), + new TextLoader.Column("education", DataKind.Text, 2), + new TextLoader.Column("marital-status", DataKind.Text, 3), + new TextLoader.Column("occupation", DataKind.Text, 4), + new TextLoader.Column("relationship", DataKind.Text, 5), + new TextLoader.Column("ethnicity", DataKind.Text, 6), + new TextLoader.Column("sex", DataKind.Text, 7), + new TextLoader.Column("native-country-region", DataKind.Text, 8), + new TextLoader.Column("age", DataKind.R4, 9), + new TextLoader.Column("fnlwgt", DataKind.R4, 10), + new TextLoader.Column("education-num", DataKind.R4, 11), + new TextLoader.Column("capital-gain", DataKind.R4, 12), + new TextLoader.Column("capital-loss", DataKind.R4, 13), + new TextLoader.Column("hours-per-week", DataKind.R4, 14) + } + }); + + IDataView data = reader.Read(dataFilePath); + + var (trainData, testData) = ml.BinaryClassification.TrainTestSplit(data, testFraction: 0.2); + + var pipeline = ml.Transforms.Concatenate("Text", "workclass", "education", "marital-status", + "relationship", "ethnicity", "sex", "native-country-region") + .Append(ml.Transforms.Text.FeaturizeText("Text", "TextFeatures")) + .Append(ml.Transforms.Concatenate("Features", "TextFeatures", "age", "fnlwgt", + "education-num", "capital-gain", "capital-loss", "hours-per-week")); + + var model = pipeline.Fit(trainData); + + var dataWithPredictions = model.Transform(testData); + + var crossValidation = ml.BinaryClassification.CrossValidate(dataWithPredictions, pipeline); + + var averageAuc = crossValidation.Average(i => i.metrics.Auc); + + Console.WriteLine($"Average cross validation AUC - {averageAuc}"); + } + } +} From 8e8067012906ec067ac2a8e889ec0bd8de1b252f Mon Sep 17 00:00:00 2001 From: J W Date: Tue, 15 Jan 2019 23:19:31 -0500 Subject: [PATCH 02/10] Pipeline changes --- .../Dynamic/LogisticRegression.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs index c177186f48..32dfae67a4 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs @@ -64,18 +64,24 @@ public static void LogisticRegression() var pipeline = ml.Transforms.Concatenate("Text", "workclass", "education", "marital-status", "relationship", "ethnicity", "sex", "native-country-region") .Append(ml.Transforms.Text.FeaturizeText("Text", "TextFeatures")) - .Append(ml.Transforms.Concatenate("Features", "TextFeatures", "age", "fnlwgt", - "education-num", "capital-gain", "capital-loss", "hours-per-week")); + .Append(ml.Transforms.Concatenate("Features", "TextFeatures", "age", "fnlwgt", + "education-num", "capital-gain", "capital-loss", "hours-per-week")) + .Append(ml.BinaryClassification.Trainers.LogisticRegression("Label", "Features")); var model = pipeline.Fit(trainData); var dataWithPredictions = model.Transform(testData); - var crossValidation = ml.BinaryClassification.CrossValidate(dataWithPredictions, pipeline); + var metrics = ml.BinaryClassification.Evaluate(dataWithPredictions); - var averageAuc = crossValidation.Average(i => i.metrics.Auc); + Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.84 + Console.WriteLine($"AUC: {metrics.Auc}"); // 0.89 + Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.64 - Console.WriteLine($"Average cross validation AUC - {averageAuc}"); + Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.88 + Console.WriteLine($"Negative Recall: {metrics.NegativeRecall}"); // 0.91 + Console.WriteLine($"Positive Precision: {metrics.PositivePrecision}"); // 0.68 + Console.WriteLine($"Positive Recall: {metrics.PositiveRecall}"); // 0.60 } } } From efae1ddd24c0cc4460737765dd4caeb94aadddec Mon Sep 17 00:00:00 2001 From: J W Date: Sun, 20 Jan 2019 18:35:30 -0500 Subject: [PATCH 03/10] updates --- .../Microsoft.ML.Samples/Dynamic/LogisticRegression.cs | 4 ++-- docs/samples/Microsoft.ML.Samples/Program.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs index 32dfae67a4..149c6cfea5 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs @@ -33,7 +33,7 @@ public static void LogisticRegression() // 14. Column: capital-loss (numeric) // 15. Column: hours-per-week (numeric) - var reader = ml.Data.CreateTextReader(new TextLoader.Arguments + var reader = ml.Data.CreateTextLoader(new TextLoader.Arguments { Separator = ",", HasHeader = true, @@ -66,7 +66,7 @@ public static void LogisticRegression() .Append(ml.Transforms.Text.FeaturizeText("Text", "TextFeatures")) .Append(ml.Transforms.Concatenate("Features", "TextFeatures", "age", "fnlwgt", "education-num", "capital-gain", "capital-loss", "hours-per-week")) - .Append(ml.BinaryClassification.Trainers.LogisticRegression("Label", "Features")); + .Append(ml.BinaryClassification.Trainers.LogisticRegression()); var model = pipeline.Fit(trainData); diff --git a/docs/samples/Microsoft.ML.Samples/Program.cs b/docs/samples/Microsoft.ML.Samples/Program.cs index 41f465ef5e..0ad665359c 100644 --- a/docs/samples/Microsoft.ML.Samples/Program.cs +++ b/docs/samples/Microsoft.ML.Samples/Program.cs @@ -6,7 +6,7 @@ internal static class Program { static void Main(string[] args) { - FeatureContributionCalculationTransform_RegressionExample.FeatureContributionCalculationTransform_Regression(); + LogisticRegression_example.LogisticRegression(); } } } From ea5837d1cb5a4ba1ec77c59211132b0b15c44970 Mon Sep 17 00:00:00 2001 From: J W Date: Sun, 27 Jan 2019 10:29:23 -0500 Subject: [PATCH 04/10] Get sample working correctly --- .../Dynamic/LogisticRegression.cs | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs index 149c6cfea5..d0f5339602 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs @@ -17,43 +17,43 @@ public static void LogisticRegression() var dataFilePath = SamplesUtils.DatasetUtils.DownloadAdultDataset(); // Data Preview - // 1. Column [Label]: IsOver50K (boolean) + // 1. Column: age (numeric) // 2. Column: workclass (text/categorical) - // 3. Column: education (text/categorical) - // 4. Column: marital-status (text/categorical) - // 5. Column: occupation (text/categorical) - // 6. Column: relationship (text/categorical) - // 7. Column: ethnicity (text/categorical) - // 8. Column: sex (text/categorical) - // 9. Column: native-country-region (text/categorical) - // 10. Column: age (numeric) - // 11. Column: fnlwgt (numeric) - // 12. Column: education-num (numeric) - // 13. Column: capital-gain (numeric) - // 14. Column: capital-loss (numeric) - // 15. Column: hours-per-week (numeric) + // 3. Column: fnlwgt (numeric) + // 4. Column: education (text/categorical) + // 5. Column: education-num (numeric) + // 6. Column: marital-status (text/categorical) + // 7. Column: occupation (text/categorical) + // 8. Column: relationship (text/categorical) + // 9. Column: ethnicity (text/categorical) + // 10. Column: sex (text/categorical) + // 11. Column: capital-gain (numeric) + // 12. Column: capital-loss (numeric) + // 13. Column: hours-per-week (numeric) + // 14. Column: native-country (text/categorical) + // 15. Column: Column [Label]: IsOver50K (boolean) var reader = ml.Data.CreateTextLoader(new TextLoader.Arguments { - Separator = ",", + Separators = new[] { ',' }, HasHeader = true, Column = new[] { - new TextLoader.Column("Label", DataKind.Bool, 0), + new TextLoader.Column("age", DataKind.R4, 0), new TextLoader.Column("workclass", DataKind.Text, 1), - new TextLoader.Column("education", DataKind.Text, 2), - new TextLoader.Column("marital-status", DataKind.Text, 3), - new TextLoader.Column("occupation", DataKind.Text, 4), - new TextLoader.Column("relationship", DataKind.Text, 5), - new TextLoader.Column("ethnicity", DataKind.Text, 6), - new TextLoader.Column("sex", DataKind.Text, 7), - new TextLoader.Column("native-country-region", DataKind.Text, 8), - new TextLoader.Column("age", DataKind.R4, 9), - new TextLoader.Column("fnlwgt", DataKind.R4, 10), - new TextLoader.Column("education-num", DataKind.R4, 11), - new TextLoader.Column("capital-gain", DataKind.R4, 12), - new TextLoader.Column("capital-loss", DataKind.R4, 13), - new TextLoader.Column("hours-per-week", DataKind.R4, 14) + new TextLoader.Column("fnlwgt", DataKind.R4, 2), + new TextLoader.Column("education", DataKind.Text, 3), + new TextLoader.Column("education-num", DataKind.R4, 4), + new TextLoader.Column("marital-status", DataKind.Text, 5), + new TextLoader.Column("occupation", DataKind.Text, 6), + new TextLoader.Column("relationship", DataKind.Text, 7), + new TextLoader.Column("ethnicity", DataKind.Text, 8), + new TextLoader.Column("sex", DataKind.Text, 9), + new TextLoader.Column("capital-gain", DataKind.R4, 10), + new TextLoader.Column("capital-loss", DataKind.R4, 11), + new TextLoader.Column("hours-per-week", DataKind.R4, 12), + new TextLoader.Column("native-country", DataKind.Text, 13), + new TextLoader.Column("Label", DataKind.Bool, 14) } }); @@ -62,7 +62,7 @@ public static void LogisticRegression() var (trainData, testData) = ml.BinaryClassification.TrainTestSplit(data, testFraction: 0.2); var pipeline = ml.Transforms.Concatenate("Text", "workclass", "education", "marital-status", - "relationship", "ethnicity", "sex", "native-country-region") + "relationship", "ethnicity", "sex", "native-country") .Append(ml.Transforms.Text.FeaturizeText("Text", "TextFeatures")) .Append(ml.Transforms.Concatenate("Features", "TextFeatures", "age", "fnlwgt", "education-num", "capital-gain", "capital-loss", "hours-per-week")) @@ -74,14 +74,14 @@ public static void LogisticRegression() var metrics = ml.BinaryClassification.Evaluate(dataWithPredictions); - Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.84 - Console.WriteLine($"AUC: {metrics.Auc}"); // 0.89 - Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.64 + Console.WriteLine($"Accuracy: {metrics.Accuracy}"); + Console.WriteLine($"AUC: {metrics.Auc}"); + Console.WriteLine($"F1 Score: {metrics.F1Score}"); - Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.88 - Console.WriteLine($"Negative Recall: {metrics.NegativeRecall}"); // 0.91 - Console.WriteLine($"Positive Precision: {metrics.PositivePrecision}"); // 0.68 - Console.WriteLine($"Positive Recall: {metrics.PositiveRecall}"); // 0.60 + Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); + Console.WriteLine($"Negative Recall: {metrics.NegativeRecall}"); + Console.WriteLine($"Positive Precision: {metrics.PositivePrecision}"); + Console.WriteLine($"Positive Recall: {metrics.PositiveRecall}"); } } } From ac423e487ee8c83c79db2a47b12cc4dd6bcebe3e Mon Sep 17 00:00:00 2001 From: J W Date: Sun, 27 Jan 2019 10:30:17 -0500 Subject: [PATCH 05/10] Don't change sample to run in program --- docs/samples/Microsoft.ML.Samples/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/samples/Microsoft.ML.Samples/Program.cs b/docs/samples/Microsoft.ML.Samples/Program.cs index 0ad665359c..41f465ef5e 100644 --- a/docs/samples/Microsoft.ML.Samples/Program.cs +++ b/docs/samples/Microsoft.ML.Samples/Program.cs @@ -6,7 +6,7 @@ internal static class Program { static void Main(string[] args) { - LogisticRegression_example.LogisticRegression(); + FeatureContributionCalculationTransform_RegressionExample.FeatureContributionCalculationTransform_Regression(); } } } From 4f8886bbdd57cfcd56388a75f315f56bc13c5a89 Mon Sep 17 00:00:00 2001 From: J W Date: Tue, 29 Jan 2019 05:44:18 -0500 Subject: [PATCH 06/10] Update class name --- .../Microsoft.ML.Samples/Dynamic/LogisticRegression.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs index d0f5339602..74f40716c6 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs @@ -6,7 +6,7 @@ namespace Microsoft.ML.Samples.Dynamic { - public class LogisticRegression_example + public class LogisticRegressionExample { public static void LogisticRegression() { @@ -82,6 +82,8 @@ public static void LogisticRegression() Console.WriteLine($"Negative Recall: {metrics.NegativeRecall}"); Console.WriteLine($"Positive Precision: {metrics.PositivePrecision}"); Console.WriteLine($"Positive Recall: {metrics.PositiveRecall}"); + + Console.ReadLine(); } } } From 4e6eb7d191d5abc4d282960d68bfe1551943c099 Mon Sep 17 00:00:00 2001 From: J W Date: Tue, 29 Jan 2019 05:49:52 -0500 Subject: [PATCH 07/10] Add score comments --- .../Dynamic/LogisticRegression.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs index 74f40716c6..b8fac911c1 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using Microsoft.Data.DataView; using Microsoft.ML.Data; namespace Microsoft.ML.Samples.Dynamic @@ -74,14 +72,14 @@ public static void LogisticRegression() var metrics = ml.BinaryClassification.Evaluate(dataWithPredictions); - Console.WriteLine($"Accuracy: {metrics.Accuracy}"); - Console.WriteLine($"AUC: {metrics.Auc}"); - Console.WriteLine($"F1 Score: {metrics.F1Score}"); + Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.80 + Console.WriteLine($"AUC: {metrics.Auc}"); // 0.64 + Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.39 - Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); - Console.WriteLine($"Negative Recall: {metrics.NegativeRecall}"); - Console.WriteLine($"Positive Precision: {metrics.PositivePrecision}"); - Console.WriteLine($"Positive Recall: {metrics.PositiveRecall}"); + Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.81 + Console.WriteLine($"Negative Recall: {metrics.NegativeRecall}"); // 0.96 + Console.WriteLine($"Positive Precision: {metrics.PositivePrecision}"); // 0.68 + Console.WriteLine($"Positive Recall: {metrics.PositiveRecall}"); // 0.27 Console.ReadLine(); } From 0f749c3e4e3f1422124820ce56bb44666d1b93e2 Mon Sep 17 00:00:00 2001 From: J W Date: Tue, 29 Jan 2019 05:52:02 -0500 Subject: [PATCH 08/10] Add sample reference to declaration --- .../Standard/LogisticRegression/LogisticRegression.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs index e4cdadd0e9..7b6a2b6ff5 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs @@ -75,6 +75,13 @@ public sealed class Options : ArgumentsBase /// Weight of L2 regularizer term. /// Memory size for . Low=faster, less accurate. /// Threshold for optimizer convergence. + /// + /// + /// + /// + /// internal LogisticRegression(IHostEnvironment env, string labelColumn = DefaultColumnNames.Label, string featureColumn = DefaultColumnNames.Features, From 37edf07346429c8fbb1b4d0be8b57112dcf09bf2 Mon Sep 17 00:00:00 2001 From: J W Date: Tue, 29 Jan 2019 21:02:57 -0500 Subject: [PATCH 09/10] Move example reference --- .../Standard/LogisticRegression/LogisticRegression.cs | 7 ------- .../StandardLearnersCatalog.cs | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs index 19c0bc70df..8835de8f9e 100644 --- a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs +++ b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/LogisticRegression.cs @@ -75,13 +75,6 @@ public sealed class Options : ArgumentsBase /// Weight of L2 regularizer term. /// Memory size for . Low=faster, less accurate. /// Threshold for optimizer convergence. - /// - /// - /// - /// - /// internal LogisticRegression(IHostEnvironment env, string labelColumn = DefaultColumnNames.Label, string featureColumn = DefaultColumnNames.Features, diff --git a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs index 2d02ab6557..5cc4d87846 100644 --- a/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs +++ b/src/Microsoft.ML.StandardLearners/StandardLearnersCatalog.cs @@ -303,6 +303,13 @@ public static OnlineGradientDescentTrainer OnlineGradientDescent(this Regression /// Weight of L2 regularization term. /// Memory size for . Low=faster, less accurate. /// Threshold for optimizer convergence. + /// + /// + /// + /// + /// public static LogisticRegression LogisticRegression(this BinaryClassificationCatalog.BinaryClassificationTrainers catalog, string labelColumn = DefaultColumnNames.Label, string featureColumn = DefaultColumnNames.Features, From 9b16dd1382167e9fd8cf167a218d0692d6013df5 Mon Sep 17 00:00:00 2001 From: J W Date: Wed, 30 Jan 2019 07:16:24 -0500 Subject: [PATCH 10/10] Switch parameters --- docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs index b8fac911c1..6ec156e61d 100644 --- a/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs +++ b/docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs @@ -61,7 +61,7 @@ public static void LogisticRegression() var pipeline = ml.Transforms.Concatenate("Text", "workclass", "education", "marital-status", "relationship", "ethnicity", "sex", "native-country") - .Append(ml.Transforms.Text.FeaturizeText("Text", "TextFeatures")) + .Append(ml.Transforms.Text.FeaturizeText("TextFeatures", "Text")) .Append(ml.Transforms.Concatenate("Features", "TextFeatures", "age", "fnlwgt", "education-num", "capital-gain", "capital-loss", "hours-per-week")) .Append(ml.BinaryClassification.Trainers.LogisticRegression());