Skip to content

Commit e7f61dc

Browse files
committed
find and replace MultiClass to Multiclass
1 parent 76546bc commit e7f61dc

File tree

99 files changed

+427
-427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+427
-427
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static void Example()
2626
// CC 1.216908,1.248052,1.391902,0.4326252,1.099942,0.9262842,1.334019,1.08762,0.9468155,0.4811099
2727
// DD 0.7871246,1.053327,0.8971719,1.588544,1.242697,1.362964,0.6303943,0.9810045,0.9431419,1.557455
2828

29-
var options = new SdcaMultiClassTrainer.Options
29+
var options = new SdcaMulticlassTrainer.Options
3030
{
3131
// Add custom loss
3232
LossFunction = new HingeLoss(),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.ML.Samples.Static
99
{
1010
class LightGBMMulticlassWithInMemoryData
1111
{
12-
public void MultiClassLightGbmStaticPipelineWithInMemoryData()
12+
public void MulticlassLightGbmStaticPipelineWithInMemoryData()
1313
{
1414
// Create a general context for ML.NET operations. It can be used for exception tracking and logging,
1515
// as a catalog of available operations and as the source of randomness.

src/Microsoft.ML.Core/Data/AnnotationUtils.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static class Const
8787
public static class ScoreColumnKind
8888
{
8989
public const string BinaryClassification = "BinaryClassification";
90-
public const string MultiClassClassification = "MultiClassClassification";
90+
public const string MulticlassClassification = "MultiClassClassification";
9191
public const string Regression = "Regression";
9292
public const string Ranking = "Ranking";
9393
public const string Clustering = "Clustering";

src/Microsoft.ML.Core/Prediction/IPredictor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal enum PredictionKind
1919
Custom = 1,
2020

2121
BinaryClassification = 2,
22-
MultiClassClassification = 3,
22+
MulticlassClassification = 3,
2323
Regression = 4,
2424
MultiOutputRegression = 5,
2525
Ranking = 6,

src/Microsoft.ML.Core/Prediction/ITrainer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.ML
1919
[BestFriend]
2020
internal delegate void SignatureBinaryClassifierTrainer();
2121
[BestFriend]
22-
internal delegate void SignatureMultiClassClassifierTrainer();
22+
internal delegate void SignatureMulticlassClassifierTrainer();
2323
[BestFriend]
2424
internal delegate void SignatureRegressorTrainer();
2525
[BestFriend]

src/Microsoft.ML.Data/DataLoadSave/TransformerChain.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public static TransformerChain<ITransformer> LoadFrom(IHostEnvironment env, Stre
277277
if (predictor.PredictionKind == PredictionKind.BinaryClassification)
278278
pred = new BinaryPredictionTransformer<IPredictorProducing<float>>(env, predictor as IPredictorProducing<float>, chain.Schema,
279279
roles.Where(x => x.Key.Value == RoleMappedSchema.ColumnRole.Feature.Value).First().Value);
280-
else if (predictor.PredictionKind == PredictionKind.MultiClassClassification)
280+
else if (predictor.PredictionKind == PredictionKind.MulticlassClassification)
281281
pred = new MulticlassClassificationPredictionTransformer<IPredictorProducing<VBuffer<float>>>(env,
282282
predictor as IPredictorProducing<VBuffer<float>>, chain.Schema,
283283
roles.Where(x => x.Key.Value == RoleMappedSchema.ColumnRole.Feature.Value).First().Value,

src/Microsoft.ML.Data/EntryPoints/InputBuilder.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -839,11 +839,11 @@ public static class PipelineSweeperSupportedMetrics
839839
{
840840
public static new string ToString() => "SupportedMetric";
841841
public const string Auc = BinaryClassifierEvaluator.Auc;
842-
public const string AccuracyMicro = Data.MultiClassClassificationEvaluator.AccuracyMicro;
843-
public const string AccuracyMacro = MultiClassClassificationEvaluator.AccuracyMacro;
842+
public const string AccuracyMicro = Data.MulticlassClassificationEvaluator.AccuracyMicro;
843+
public const string AccuracyMacro = MulticlassClassificationEvaluator.AccuracyMacro;
844844
public const string F1 = BinaryClassifierEvaluator.F1;
845845
public const string AuPrc = BinaryClassifierEvaluator.AuPrc;
846-
public const string TopKAccuracy = MultiClassClassificationEvaluator.TopKAccuracy;
846+
public const string TopKAccuracy = MulticlassClassificationEvaluator.TopKAccuracy;
847847
public const string L1 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L1;
848848
public const string L2 = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.L2;
849849
public const string Rms = RegressionLossEvaluatorBase<MultiOutputRegressionEvaluator.Aggregator>.Rms;

src/Microsoft.ML.Data/Evaluators/EvaluatorUtils.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static Dictionary<string, Func<IHostEnvironment, IMamlEvaluator>> Instanc
4040
var tmp = new Dictionary<string, Func<IHostEnvironment, IMamlEvaluator>>
4141
{
4242
{ AnnotationUtils.Const.ScoreColumnKind.BinaryClassification, env => new BinaryClassifierMamlEvaluator(env, new BinaryClassifierMamlEvaluator.Arguments()) },
43-
{ AnnotationUtils.Const.ScoreColumnKind.MultiClassClassification, env => new MultiClassClassificationMamlEvaluator(env, new MultiClassClassificationMamlEvaluator.Arguments()) },
43+
{ AnnotationUtils.Const.ScoreColumnKind.MulticlassClassification, env => new MulticlassClassificationMamlEvaluator(env, new MulticlassClassificationMamlEvaluator.Arguments()) },
4444
{ AnnotationUtils.Const.ScoreColumnKind.Regression, env => new RegressionMamlEvaluator(env, new RegressionMamlEvaluator.Arguments()) },
4545
{ AnnotationUtils.Const.ScoreColumnKind.MultiOutputRegression, env => new MultiOutputRegressionMamlEvaluator(env, new MultiOutputRegressionMamlEvaluator.Arguments()) },
4646
{ AnnotationUtils.Const.ScoreColumnKind.QuantileRegression, env => new QuantileRegressionMamlEvaluator(env, new QuantileRegressionMamlEvaluator.Arguments()) },

src/Microsoft.ML.Data/Evaluators/Metrics/MultiClassClassificationMetrics.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.ML.Data
1212
/// <summary>
1313
/// Evaluation results for multi-class classification trainers.
1414
/// </summary>
15-
public sealed class MultiClassClassificationMetrics
15+
public sealed class MulticlassClassificationMetrics
1616
{
1717
/// <summary>
1818
/// Gets the average log-loss of the classifier.
@@ -83,22 +83,22 @@ public sealed class MultiClassClassificationMetrics
8383
/// </remarks>
8484
public IReadOnlyList<double> PerClassLogLoss { get; }
8585

86-
internal MultiClassClassificationMetrics(IExceptionContext ectx, DataViewRow overallResult, int topK)
86+
internal MulticlassClassificationMetrics(IExceptionContext ectx, DataViewRow overallResult, int topK)
8787
{
8888
double FetchDouble(string name) => RowCursorUtils.Fetch<double>(ectx, overallResult, name);
89-
MicroAccuracy = FetchDouble(MultiClassClassificationEvaluator.AccuracyMicro);
90-
MacroAccuracy = FetchDouble(MultiClassClassificationEvaluator.AccuracyMacro);
91-
LogLoss = FetchDouble(MultiClassClassificationEvaluator.LogLoss);
92-
LogLossReduction = FetchDouble(MultiClassClassificationEvaluator.LogLossReduction);
89+
MicroAccuracy = FetchDouble(MulticlassClassificationEvaluator.AccuracyMicro);
90+
MacroAccuracy = FetchDouble(MulticlassClassificationEvaluator.AccuracyMacro);
91+
LogLoss = FetchDouble(MulticlassClassificationEvaluator.LogLoss);
92+
LogLossReduction = FetchDouble(MulticlassClassificationEvaluator.LogLossReduction);
9393
TopK = topK;
9494
if (topK > 0)
95-
TopKAccuracy = FetchDouble(MultiClassClassificationEvaluator.TopKAccuracy);
95+
TopKAccuracy = FetchDouble(MulticlassClassificationEvaluator.TopKAccuracy);
9696

97-
var perClassLogLoss = RowCursorUtils.Fetch<VBuffer<double>>(ectx, overallResult, MultiClassClassificationEvaluator.PerClassLogLoss);
97+
var perClassLogLoss = RowCursorUtils.Fetch<VBuffer<double>>(ectx, overallResult, MulticlassClassificationEvaluator.PerClassLogLoss);
9898
PerClassLogLoss = perClassLogLoss.DenseValues().ToImmutableArray();
9999
}
100100

101-
internal MultiClassClassificationMetrics(double accuracyMicro, double accuracyMacro, double logLoss, double logLossReduction,
101+
internal MulticlassClassificationMetrics(double accuracyMicro, double accuracyMacro, double logLoss, double logLossReduction,
102102
int topK, double topKAccuracy, double[] perClassLogLoss)
103103
{
104104
MicroAccuracy = accuracyMicro;

0 commit comments

Comments
 (0)