Skip to content

Commit 542b845

Browse files
committed
PR feedback.
1 parent 3424775 commit 542b845

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/Microsoft.ML/Models/BinaryClassificationEvaluator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public BinaryClassificationMetrics Evaluate(PredictionModel model, ILearningPipe
7272

7373
Contracts.Assert(metric.Count == 1);
7474

75-
return metric.First();
75+
return metric[0];
7676
}
7777
}
7878
}

src/Microsoft.ML/Models/ClassificationEvaluator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public ClassificationMetrics Evaluate(PredictionModel model, ILearningPipelineLo
7272

7373
Contracts.Assert(metric.Count == 1);
7474

75-
return metric.First();
75+
return metric[0];
7676
}
7777
}
7878
}

src/Microsoft.ML/Models/CrossValidator.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,31 +116,31 @@ public CrossValidationOutput<TInput, TOutput> CrossValidate<TInput, TOutput>(Lea
116116

117117
experiment.Run();
118118

119-
CrossValidationOutput<TInput, TOutput> cvo = new CrossValidationOutput<TInput, TOutput>();
120-
cvo.PredictorModels = new PredictionModel<TInput, TOutput>[NumFolds];
119+
var cvOutput = new CrossValidationOutput<TInput, TOutput>();
120+
cvOutput.PredictorModels = new PredictionModel<TInput, TOutput>[NumFolds];
121121

122122
for (int Index = 0; Index < NumFolds; Index++)
123123
{
124124

125125
if (Kind == MacroUtilsTrainerKinds.SignatureBinaryClassifierTrainer)
126126
{
127-
cvo.BinaryClassificationMetrics = BinaryClassificationMetrics.FromMetrics(
127+
cvOutput.BinaryClassificationMetrics = BinaryClassificationMetrics.FromMetrics(
128128
environment,
129129
experiment.GetOutput(crossValidateOutput.OverallMetrics),
130130
experiment.GetOutput(crossValidateOutput.ConfusionMatrix),
131131
2);
132132
}
133133
else if(Kind == MacroUtilsTrainerKinds.SignatureMultiClassClassifierTrainer)
134134
{
135-
cvo.ClassificationMetrics = ClassificationMetrics.FromMetrics(
135+
cvOutput.ClassificationMetrics = ClassificationMetrics.FromMetrics(
136136
environment,
137137
experiment.GetOutput(crossValidateOutput.OverallMetrics),
138138
experiment.GetOutput(crossValidateOutput.ConfusionMatrix),
139139
2);
140140
}
141141
else if (Kind == MacroUtilsTrainerKinds.SignatureRegressorTrainer)
142142
{
143-
cvo.RegressionMetrics = RegressionMetrics.FromOverallMetrics(
143+
cvOutput.RegressionMetrics = RegressionMetrics.FromOverallMetrics(
144144
environment,
145145
experiment.GetOutput(crossValidateOutput.OverallMetrics),
146146
2);
@@ -161,11 +161,11 @@ public CrossValidationOutput<TInput, TOutput> CrossValidate<TInput, TOutput>(Lea
161161

162162
predictor = environment.CreateBatchPredictionEngine<TInput, TOutput>(memoryStream);
163163

164-
cvo.PredictorModels[Index] = new PredictionModel<TInput, TOutput>(predictor, memoryStream);
164+
cvOutput.PredictorModels[Index] = new PredictionModel<TInput, TOutput>(predictor, memoryStream);
165165
}
166166
}
167167

168-
return cvo;
168+
return cvOutput;
169169
}
170170
}
171171
}

src/Microsoft.ML/Models/RegressionEvaluator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public RegressionMetrics Evaluate(PredictionModel model, ILearningPipelineLoader
6767

6868
Contracts.Assert(metric.Count == 1);
6969

70-
return metric.First();
70+
return metric[0];
7171
}
7272
}
7373
}

src/Microsoft.ML/Models/TrainTestEvaluator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ public TrainTestEvaluatorOutput<TInput, TOutput> TrainTestEvaluate<TInput, TOutp
119119

120120
experiment.Run();
121121

122-
TrainTestEvaluatorOutput<TInput, TOutput> trainTestOutput = new TrainTestEvaluatorOutput<TInput, TOutput>();
123-
122+
var trainTestOutput = new TrainTestEvaluatorOutput<TInput, TOutput>();
124123
if (Kind == MacroUtilsTrainerKinds.SignatureBinaryClassifierTrainer)
125124
{
126125
trainTestOutput.BinaryClassificationMetrics = BinaryClassificationMetrics.FromMetrics(

src/Microsoft.ML/Runtime/EntryPoints/CrossValidationMacro.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@ public static CommonOutputs.MacroOutput<Output> CrossValidate(
294294
var confusionMatrix = new Var<IDataView>();
295295
outputMap.Add(nameof(TrainTestMacro.Output.ConfusionMatrix), confusionMatrix.VarName);
296296
confusionMatrixVars[k] = confusionMatrix;
297-
subGraphNodes.Add(EntryPointNode.Create(env, "Models.TrainTestEvaluator", args, node.Catalog, node.Context, inputBindingMap, inputMap, outputMap));
297+
const string trainTestEvaluatorMacroEntryPoint = "Models.TrainTestEvaluator";
298+
subGraphNodes.Add(EntryPointNode.Create(env, trainTestEvaluatorMacroEntryPoint, args, node.Catalog, node.Context, inputBindingMap, inputMap, outputMap));
298299
}
299300

300301
exp.Reset();

0 commit comments

Comments
 (0)