Skip to content

Commit 4484db2

Browse files
authored
Clean up metrics classes. (#2700)
* Convert short names to full names. * PR feedback. * Build break. * PR feedback. * rebase errors. * PR feedback. * rebase errors.
1 parent a0edc5c commit 4484db2

38 files changed

+285
-276
lines changed

docs/samples/Microsoft.ML.Samples/Dynamic/LogisticRegression.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static void Example()
7373
var metrics = ml.BinaryClassification.Evaluate(dataWithPredictions);
7474

7575
Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.80
76-
Console.WriteLine($"AUC: {metrics.Auc}"); // 0.64
76+
Console.WriteLine($"AUC: {metrics.AreaUnderRocCurve}"); // 0.64
7777
Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.39
7878

7979
Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.81

docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/MulticlassClassification/LightGbm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static void Example()
4949
var metrics = mlContext.MulticlassClassification.Evaluate(dataWithPredictions, label: "LabelIndex");
5050

5151
// Check if metrics are reasonable.
52-
Console.WriteLine($"Macro accuracy: {metrics.AccuracyMacro:F4}, Micro accuracy: {metrics.AccuracyMicro:F4}.");
52+
Console.WriteLine($"Macro accuracy: {metrics.MacroAccuracy:F4}, Micro accuracy: {metrics.MicroAccuracy:F4}.");
5353
// Console output:
5454
// Macro accuracy: 0.8655, Micro accuracy: 0.8651.
5555

docs/samples/Microsoft.ML.Samples/Dynamic/Trainers/MulticlassClassification/LightGbmWithOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static void Example()
6060
var metrics = mlContext.MulticlassClassification.Evaluate(dataWithPredictions, label: "LabelIndex");
6161

6262
// Check if metrics are reasonable.
63-
Console.WriteLine($"Macro accuracy: {metrics.AccuracyMacro:F4}, Micro accuracy: {metrics.AccuracyMicro:F4}.");
63+
Console.WriteLine($"Macro accuracy: {metrics.MacroAccuracy:F4}, Micro accuracy: {metrics.MicroAccuracy:F4}.");
6464
// Console output:
6565
// Macro accuracy: 0.8619, Micro accuracy: 0.8611.
6666

docs/samples/Microsoft.ML.Samples/Static/AveragedPerceptronBinaryClassification.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static void AveragedPerceptronBinaryClassification()
9292
var metrics = mlContext.BinaryClassification.Evaluate(dataWithPredictions, row => row.Label, row => row.Score);
9393

9494
Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.83
95-
Console.WriteLine($"AUC: {metrics.Auc}"); // 0.88
95+
Console.WriteLine($"AUC: {metrics.AreaUnderRocCurve}"); // 0.88
9696
Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.63
9797

9898
Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.89

docs/samples/Microsoft.ML.Samples/Static/FastTreeBinaryClassification.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void FastTreeBinaryClassification()
9595
var metrics = mlContext.BinaryClassification.Evaluate(dataWithPredictions, row => row.Label, row => row.Score);
9696

9797
Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.84
98-
Console.WriteLine($"AUC: {metrics.Auc}"); // 0.89
98+
Console.WriteLine($"AUC: {metrics.AreaUnderRocCurve}"); // 0.89
9999
Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.64
100100

101101
Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.88

docs/samples/Microsoft.ML.Samples/Static/FastTreeRegression.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public static void FastTreeRegression()
4747

4848
var cvResults = mlContext.Regression.CrossValidate(data, learningPipeline, r => r.label, numFolds: 5);
4949
var averagedMetrics = (
50-
L1: cvResults.Select(r => r.metrics.L1).Average(),
51-
L2: cvResults.Select(r => r.metrics.L2).Average(),
52-
LossFn: cvResults.Select(r => r.metrics.LossFn).Average(),
53-
Rms: cvResults.Select(r => r.metrics.Rms).Average(),
50+
L1: cvResults.Select(r => r.metrics.MeanAbsoluteError).Average(),
51+
L2: cvResults.Select(r => r.metrics.MeanSquaredError).Average(),
52+
LossFn: cvResults.Select(r => r.metrics.LossFunction).Average(),
53+
Rms: cvResults.Select(r => r.metrics.RootMeanSquaredError).Average(),
5454
RSquared: cvResults.Select(r => r.metrics.RSquared).Average()
5555
);
5656
Console.WriteLine($"L1 - {averagedMetrics.L1}"); // 3.091095

docs/samples/Microsoft.ML.Samples/Static/LightGBMBinaryClassification.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static void LightGbmBinaryClassification()
9595
var metrics = mlContext.BinaryClassification.Evaluate(dataWithPredictions, row => row.Label, row => row.Score);
9696

9797
Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.84
98-
Console.WriteLine($"AUC: {metrics.Auc}"); // 0.89
98+
Console.WriteLine($"AUC: {metrics.AreaUnderRocCurve}"); // 0.89
9999
Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.64
100100

101101
Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.88

docs/samples/Microsoft.ML.Samples/Static/LightGBMRegression.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ public static void LightGbmRegression()
6060
var dataWithPredictions = model.Transform(testData);
6161
var metrics = mlContext.Regression.Evaluate(dataWithPredictions, r => r.label, r => r.score);
6262

63-
Console.WriteLine($"L1 - {metrics.L1}"); // 4.9669731
64-
Console.WriteLine($"L2 - {metrics.L2}"); // 51.37296
65-
Console.WriteLine($"LossFunction - {metrics.LossFn}"); // 51.37296
66-
Console.WriteLine($"RMS - {metrics.Rms}"); // 7.167493
63+
Console.WriteLine($"L1 - {metrics.MeanAbsoluteError}"); // 4.9669731
64+
Console.WriteLine($"L2 - {metrics.MeanSquaredError}"); // 51.37296
65+
Console.WriteLine($"LossFunction - {metrics.LossFunction}"); // 51.37296
66+
Console.WriteLine($"RMS - {metrics.RootMeanSquaredError}"); // 7.167493
6767
Console.WriteLine($"RSquared - {metrics.RSquared}"); // 0.079478
6868
}
6969
}

docs/samples/Microsoft.ML.Samples/Static/SDCABinaryClassification.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static void SdcaBinaryClassification()
9292
var metrics = mlContext.BinaryClassification.Evaluate(dataWithPredictions, row => row.Label, row => row.Score);
9393

9494
Console.WriteLine($"Accuracy: {metrics.Accuracy}"); // 0.83
95-
Console.WriteLine($"AUC: {metrics.Auc}"); // 0.88
95+
Console.WriteLine($"AUC: {metrics.AreaUnderRocCurve}"); // 0.88
9696
Console.WriteLine($"F1 Score: {metrics.F1Score}"); // 0.59
9797

9898
Console.WriteLine($"Negative Precision: {metrics.NegativePrecision}"); // 0.87

docs/samples/Microsoft.ML.Samples/Static/SDCARegression.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public static void SdcaRegression()
5757
var dataWithPredictions = model.Transform(testData);
5858
var metrics = mlContext.Regression.Evaluate(dataWithPredictions, r => r.label, r => r.score);
5959

60-
Console.WriteLine($"L1 - {metrics.L1}"); // 3.7226085
61-
Console.WriteLine($"L2 - {metrics.L2}"); // 24.250636
62-
Console.WriteLine($"LossFunction - {metrics.LossFn}"); // 24.25063
63-
Console.WriteLine($"RMS - {metrics.Rms}"); // 4.924493
60+
Console.WriteLine($"L1 - {metrics.MeanAbsoluteError}"); // 3.7226085
61+
Console.WriteLine($"L2 - {metrics.MeanSquaredError}"); // 24.250636
62+
Console.WriteLine($"LossFunction - {metrics.LossFunction}"); // 24.25063
63+
Console.WriteLine($"RMS - {metrics.RootMeanSquaredError}"); // 4.924493
6464
Console.WriteLine($"RSquared - {metrics.RSquared}"); // 0.565467
6565
}
6666
}

0 commit comments

Comments
 (0)